@wocker/ws 1.0.20 → 1.0.22

package/lib/repositories/PresetRepository.js

@@ -0,0 +1,115 @@
+"use strict";
+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 __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.PresetRepository = void 0;
+const core_1 = require("@wocker/core");
+const AppConfigService_1 = require("../services/AppConfigService");
+const LogService_1 = require("../services/LogService");
+const env_1 = require("../env");
+let PresetRepository = class PresetRepository {
+    constructor(appConfig, logService) {
+        this.appConfig = appConfig;
+        this.logService = logService;
+    }
+    load(data) {
+        const _this = this, fs = new core_1.FileSystem(data.path);
+        const config = {
+            ...fs.readJSON("config.json"),
+            name: data.name,
+            source: data.source,
+            path: data.path
+        };
+        return new class extends core_1.Preset {
+            constructor(data) {
+                super(data);
+            }
+            save() {
+                switch (this.source) {
+                    case core_1.PRESET_SOURCE_EXTERNAL:
+                        fs.writeJSON("config.json", this.toObject());
+                        break;
+                }
+                _this.appConfig.registerPreset(this.name, this.source, data.path);
+            }
+            delete() {
+                switch (this.source) {
+                    case core_1.PRESET_SOURCE_GITHUB:
+                        if (fs.exists()) {
+                            fs.rm("", {
+                                recursive: true
+                            });
+                        }
+                        break;
+                }
+                _this.appConfig.unregisterPreset(this.name);
+            }
+        }(config);
+    }
+    configs() {
+        const fs = new core_1.FileSystem(env_1.PRESETS_DIR), dirs = fs.exists("") ? fs.readdir("") : [];
+        const { presets = [] } = this.appConfig.config;
+        return [
+            ...dirs.map((name) => {
+                return {
+                    name,
+                    source: core_1.PRESET_SOURCE_INTERNAL,
+                    path: fs.path(name)
+                };
+            }),
+            ...presets.map((item) => {
+                if (item.source === core_1.PRESET_SOURCE_GITHUB) {
+                    return {
+                        ...item,
+                        path: this.appConfig.fs.path("presets", item.name)
+                    };
+                }
+                return item;
+            })
+        ];
+    }
+    search(options = {}) {
+        const { name, source, path } = options;
+        const presets = [], configs = this.configs();
+        for (const config of configs) {
+            if (name && name !== config.name) {
+                continue;
+            }
+            if (source && source !== config.source) {
+                continue;
+            }
+            if (path && path !== config.path) {
+                continue;
+            }
+            try {
+                const preset = this.load(config);
+                presets.push(preset);
+            }
+            catch (err) {
+                this.logService.error(err.message, {
+                    name: config.name,
+                    source: config.source,
+                    path: config.path
+                });
+            }
+        }
+        return presets;
+    }
+    searchOne(options = {}) {
+        const [preset] = this.search(options);
+        return preset || null;
+    }
+};
+exports.PresetRepository = PresetRepository;
+exports.PresetRepository = PresetRepository = __decorate([
+    (0, core_1.Injectable)(),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        LogService_1.LogService])
+], PresetRepository);

package/lib/repositories/index.d.ts

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

package/lib/repositories/index.js

@@ -0,0 +1,17 @@
+"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("./PresetRepository"), exports);

package/lib/services/AppConfigService.d.ts

@@ -5,9 +5,17 @@ type TypeMap = {
 export declare class AppConfigService extends CoreAppConfigService {
     protected _pwd: string;
     protected _fs?: FileSystem;
+    protected _config?: AppConfig;
     protected readonly mapTypes: TypeMap;
     constructor();
     get version(): string;
+    get config(): AppConfig;
+    get projects(): {
+        id: string;
+        name?: string;
+        path?: string;
+        src?: string;
+    }[];
     get fs(): FileSystem;
     pwd(...parts: string[]): string;
     setPWD(pwd: string): void;
@@ -15,6 +23,13 @@ export declare class AppConfigService extends CoreAppConfigService {
     pluginsPath(...parts: string[]): string;
     presetPath(...parts: string[]): string;
     getProjectTypes(): TypeMap;
-    protected loadConfig(): AppConfig;
+    addProject(id: string, name: string, path: string): void;
+    removeProject(id: string): {
+        id: string;
+        name?: string;
+        path?: string;
+        src?: string;
+    };
+    save(): void;
 }
 export {};

package/lib/services/AppConfigService.js

@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 = {};
-    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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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);
 };
@@ -49,6 +59,69 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     get version() {
         return env_1.WOCKER_VERSION;
     }
+    get config() {
+        if (!this._config) {
+            const fs = this.fs;
+            let data = {};
+            if (fs.exists("wocker.config.js")) {
+                try {
+                    const { config } = require(fs.path("wocker.config.js"));
+                    data = config;
+                }
+                catch (err) {
+                    if (fs.exists("wocker.config.json")) {
+                        let json = fs.readJSON("wocker.config.json");
+                        if (typeof json === "string") {
+                            json = JSON.parse(json);
+                        }
+                        data = json;
+                    }
+                }
+            }
+            else if (fs.exists("wocker.config.json")) {
+                data = fs.readJSON("wocker.config.json");
+            }
+            else if (fs.exists("wocker.json")) {
+                let json = fs.readJSON("wocker.json");
+                if (typeof json === "string") {
+                    json = JSON.parse(json);
+                }
+                data = json;
+            }
+            else if (fs.exists("data.json")) {
+                data = fs.readJSON("data.json");
+            }
+            else if (!fs.exists()) {
+                fs.mkdir("", {
+                    recursive: true
+                });
+            }
+            this._config = new class extends core_1.AppConfig {
+                constructor(data) {
+                    super(data);
+                }
+                async save() {
+                    if (!fs.exists()) {
+                        fs.mkdir("", {
+                            recursive: true
+                        });
+                    }
+                    fs.writeFile("wocker.config.js", this.toJsString());
+                    fs.writeFile("wocker.config.json", this.toString());
+                    if (fs.exists("data.json")) {
+                        fs.rm("data.json");
+                    }
+                    if (fs.exists("wocker.json")) {
+                        fs.rm("wocker.json");
+                    }
+                }
+            }(data);
+        }
+        return this._config;
+    }
+    get projects() {
+        return this.config.projects;
+    }
     get fs() {
         if (!this._fs) {
             this._fs = new core_1.FileSystem(env_1.DATA_DIR);
@@ -73,61 +146,14 @@ let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     getProjectTypes() {
         return this.mapTypes;
     }
-    loadConfig() {
-        const fs = this.fs;
-        let data = {};
-        if (fs.exists("wocker.config.js")) {
-            try {
-                const { config } = require(fs.path("wocker.config.js"));
-                data = config;
-            }
-            catch (err) {
-                if (fs.exists("wocker.config.json")) {
-                    let json = fs.readJSON("wocker.config.json");
-                    if (typeof json === "string") {
-                        json = JSON.parse(json);
-                    }
-                    data = json;
-                }
-            }
-        }
-        else if (fs.exists("wocker.config.json")) {
-            data = fs.readJSON("wocker.config.json");
-        }
-        else if (fs.exists("wocker.json")) {
-            let json = fs.readJSON("wocker.json");
-            if (typeof json === "string") {
-                json = JSON.parse(json);
-            }
-            data = json;
-        }
-        else if (fs.exists("data.json")) {
-            data = fs.readJSON("data.json");
-        }
-        else if (!fs.exists()) {
-            fs.mkdir("", {
-                recursive: true
-            });
-        }
-        return new class extends core_1.AppConfig {
-            constructor(data) {
-                super(data);
-            }
-            async save() {
-                if (!fs.exists()) {
-                    fs.mkdir("");
-                }
-                const json = JSON.stringify(this.toJson(), null, 4);
-                await fs.writeFile("wocker.config.js", `// Wocker config\nexports.config = ${json};`);
-                await fs.writeFile("wocker.config.json", json);
-                if (fs.exists("data.json")) {
-                    await fs.rm("data.json");
-                }
-                if (fs.exists("wocker.json")) {
-                    await fs.rm("wocker.json");
-                }
-            }
-        }(data);
+    addProject(id, name, path) {
+        this.config.addProject(id, name, path);
+    }
+    removeProject(id) {
+        return this.config.getProject(id);
+    }
+    save() {
+        this.config.save();
     }
 };
 exports.AppConfigService = AppConfigService;

package/lib/services/AppEventsService.d.ts

@@ -1,9 +1,9 @@
 import { AppEventsService as CoreAppEventsService, AppEventHandle } from "@wocker/core";
 export declare class AppEventsService extends CoreAppEventsService {
-    protected handles: ({
-        [event: string]: AppEventHandle[];
-    });
-    on(event: string, handle: AppEventHandle): () => void;
+    protected handles: {
+        [event: string]: Set<AppEventHandle>;
+    };
+    on(event: string, handle: AppEventHandle): (() => void);
     off(event: string, handle: AppEventHandle): void;
     emit(event: string, ...args: any[]): Promise<void>;
 }

package/lib/services/AppEventsService.js

@@ -14,22 +14,26 @@ let AppEventsService = class AppEventsService extends core_1.AppEventsService {
         this.handles = {};
     }
     on(event, handle) {
-        this.handles[event] = [
-            ...this.handles[event] || [],
-            handle
-        ];
+        if (!this.handles[event]) {
+            this.handles[event] = new Set();
+        }
+        this.handles[event].add(handle);
         return () => {
-            this.handles[event] = this.handles[event].filter((filterHandle) => {
-                return filterHandle !== handle;
-            });
+            this.off(event, handle);
         };
     }
     off(event, handle) {
+        if (!this.handles[event]) {
+            return;
+        }
+        this.handles[event].delete(handle);
     }
     async emit(event, ...args) {
-        const handles = this.handles[event] || [];
-        for (const i in handles) {
-            await handles[i](...args);
+        if (!this.handles[event]) {
+            return;
+        }
+        for (const handle of this.handles[event].values()) {
+            await handle(...args);
         }
     }
 };

package/lib/services/CertService.js

@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 = {};
-    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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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);
 };
@@ -84,7 +94,7 @@ let CertService = class CertService {
         });
     }
     async getCertsMap() {
-        const files = await this.appConfigService.fs.readdir("certs/projects");
+        const files = this.appConfigService.fs.readdir("certs/projects");
         return files.reduce((res, file) => {
             const ext = Path.extname(file);
             const name = Path.basename(file, ext);

package/lib/services/DockerService.d.ts

@@ -1,7 +1,7 @@
-import { DockerServiceParams as Params } from "@wocker/core";
+import { DockerService as CoreDockerService, DockerServiceParams as Params } from "@wocker/core";
 import Docker, { Container, Volume, VolumeCreateResponse } from "dockerode";
 import { LogService } from "./LogService";
-export declare class DockerService {
+export declare class DockerService extends CoreDockerService {
     protected readonly logService: LogService;
     protected docker: Docker;
     constructor(logService: LogService);

package/lib/services/DockerService.js

@@ -18,8 +18,9 @@ const dockerode_1 = __importDefault(require("dockerode"));
 const utils_1 = require("../utils");
 const makes_1 = require("../makes");
 const LogService_1 = require("./LogService");
-let DockerService = class DockerService {
+let DockerService = class DockerService extends core_1.DockerService {
     constructor(logService) {
+        super();
         this.logService = logService;
         this.docker = new dockerode_1.default({
             socketPath: "/var/run/docker.sock"
@@ -49,15 +50,15 @@ let DockerService = class DockerService {
         await volume.remove();
     }
     async createContainer(params) {
-        const { name, user, entrypoint, tty, image, projectId, restart, ulimits, extraHosts, networkMode = "bridge", links = [], env = {}, volumes = [], ports = [], cmd = [] } = params;
-        const network = this.docker.getNetwork("workspace");
+        const { name, user, entrypoint, tty, image, projectId, restart, memory, memorySwap, ulimits, extraHosts, networkMode = "bridge", links = [], env = {}, volumes = [], ports = [], cmd = [], network: networkName = "workspace", aliases } = params;
+        const network = this.docker.getNetwork(networkName);
         try {
             await network.inspect();
         }
         catch (err) {
             if (err.statusCode === 404) {
                 await this.docker.createNetwork({
-                    Name: "workspace"
+                    Name: networkName
                 });
             }
         }
@@ -91,6 +92,8 @@ let DockerService = class DockerService {
                 return res;
             }, {}),
             HostConfig: {
+                Memory: memory,
+                MemorySwap: memorySwap,
                 NetworkMode: networkMode,
                 ExtraHosts: extraHosts,
                 Ulimits: ulimits ? Object.keys(ulimits).reduce((res, name) => {
@@ -126,7 +129,7 @@ let DockerService = class DockerService {
                 EndpointsConfig: networkMode === "host" ? {} : {
                     workspace: {
                         Links: links,
-                        Aliases: env.VIRTUAL_HOST ? env.VIRTUAL_HOST.split(",") : undefined
+                        Aliases: aliases || (env.VIRTUAL_HOST ? env.VIRTUAL_HOST.split(",") : undefined)
                     }
                 }
             }
@@ -180,9 +183,12 @@ let DockerService = class DockerService {
             t: tag,
             labels,
             buildargs: Object.keys(buildArgs).reduce((res, key) => {
-                res[key] = typeof buildArgs[key] !== "string"
-                    ? buildArgs[key].toString()
-                    : buildArgs[key];
+                const value = buildArgs[key];
+                if (typeof value !== "undefined") {
+                    res[key] = typeof buildArgs[key] !== "string"
+                        ? buildArgs[key].toString()
+                        : buildArgs[key];
+                }
                 return res;
             }, {}),
             dockerfile: src

package/lib/services/LogService.d.ts

@@ -1,12 +1,15 @@
-import { LogService as CoreLogService } from "@wocker/core";
+import { FileSystem, LogService as CoreLogService } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
 export declare class LogService extends CoreLogService {
     protected readonly appConfigService: AppConfigService;
     constructor(appConfigService: AppConfigService);
+    protected get fs(): FileSystem;
+    protected get logName(): string;
     debug(...data: any[]): void;
     log(...data: any[]): void;
     info(...data: any[]): void;
     warn(...data: any[]): void;
     error(...data: any[]): void;
+    clear(): void;
     protected _log(type: string, ...data: any[]): void;
 }

package/lib/services/LogService.js

@@ -23,6 +23,12 @@ let LogService = class LogService extends core_1.LogService {
         this.appConfigService = appConfigService;
         makes_1.Logger.install(this);
     }
+    get fs() {
+        return this.appConfigService.fs;
+    }
+    get logName() {
+        return "ws.log";
+    }
     debug(...data) {
         this._log("debug", ...data);
     }
@@ -38,20 +44,20 @@ let LogService = class LogService extends core_1.LogService {
     error(...data) {
         this._log("error", ...data);
     }
+    clear() {
+        this.fs.writeFile(this.logName, "");
+    }
     _log(type, ...data) {
-        const config = this.appConfigService.getConfig();
-        if (type === "debug" && !config.debug) {
+        if (type === "debug" && !this.appConfigService.config.debug) {
             return;
         }
-        const time = (0, format_1.default)(new Date(), "yyyy-MM-dd hh:mm:ss");
-        const logPath = this.appConfigService.dataPath("ws.log");
-        const logData = data.map((item) => {
+        const time = (0, format_1.default)(new Date(), "yyyy-MM-dd HH:mm:ss"), logData = data.map((item) => {
             return typeof item !== "string" ? JSON.stringify(item) : item;
         }).join(" ");
-        if (!makes_1.FS.existsSync(logPath)) {
-            makes_1.FS.writeFileSync(logPath, "");
+        if (!this.fs.exists(this.logName)) {
+            this.fs.writeFile(this.logName, "");
         }
-        makes_1.FS.appendFileSync(logPath, `[${time}] ${type}: ${logData}\n`);
+        this.fs.appendFile(this.logName, `[${time}] ${type}: ${logData}\n`);
     }
 };
 exports.LogService = LogService;

package/lib/services/PluginService.d.ts

@@ -1,13 +1,19 @@
 import { Cli } from "@wocker/core";
 import { AppConfigService } from "./AppConfigService";
 import { LogService } from "./LogService";
+import { NpmService } from "./NpmService";
+import { Plugin } from "../makes";
 export declare class PluginService {
     protected readonly appConfigService: AppConfigService;
+    protected readonly npmService: NpmService;
     protected readonly logService: LogService;
     protected readonly cli: Cli;
-    constructor(appConfigService: AppConfigService, logService: LogService, cli: Cli);
+    constructor(appConfigService: AppConfigService, npmService: NpmService, logService: LogService, cli: Cli);
+    getPluginsTable(): string;
     checkPlugin(pluginName: string): Promise<boolean>;
-    import(): Promise<void>;
+    install(pluginName: string, beta?: boolean): Promise<void>;
+    uninstall(pluginName: string): Promise<void>;
+    import(name: string): Promise<Plugin>;
     update(): Promise<void>;
     protected getCurrentVersion(name: string): Promise<string | null>;
 }