@wocker/ws 1.0.22 → 1.0.23

package/lib/controllers/ProjectController.js

@@ -55,8 +55,12 @@ const cli_table3_1 = __importDefault(require("cli-table3"));
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const Path = __importStar(require("path"));
 const async_mutex_1 = require("async-mutex");
-const makes_1 = require("../makes");
-const services_1 = require("../services");
+const AppConfigService_1 = require("../services/AppConfigService");
+const AppEventsService_1 = require("../services/AppEventsService");
+const ProjectService_1 = require("../services/ProjectService");
+const LogService_1 = require("../services/LogService");
+const modules_1 = require("../modules");
+const process = __importStar(require("node:process"));
 let ProjectController = class ProjectController {
     constructor(appConfigService, appEventsService, projectService, logService, dockerService) {
         this.appConfigService = appConfigService;
@@ -81,16 +85,16 @@ let ProjectController = class ProjectController {
         }
     }
     async init(name, type) {
+        const fs = new core_1.FileSystem(this.appConfigService.pwd());
         let project = this.projectService.searchOne({
-            path: this.appConfigService.pwd()
+            path: fs.path()
         });
-        const fs = new core_1.FileSystem(this.appConfigService.pwd());
         if (!project) {
             project = this.projectService.fromObject({
-                path: this.appConfigService.pwd()
+                path: fs.path()
             });
         }
-        project.path = this.appConfigService.pwd();
+        project.path = fs.path();
         if (name) {
             project.name = name;
         }
@@ -122,13 +126,14 @@ let ProjectController = class ProjectController {
         if (!type || !project.type || !mapTypes[project.type]) {
             project.type = await (0, utils_1.promptSelect)({
                 message: "Project type",
+                required: true,
                 options: mapTypes,
                 default: project.type
             });
         }
         switch (project.type) {
             case core_1.PROJECT_TYPE_DOCKERFILE: {
-                const files = await fs.readdirFiles();
+                const files = fs.readdir();
                 const dockerfiles = files.filter((fileName) => {
                     if (new RegExp("^(.*)\\.dockerfile$").test(fileName)) {
                         return true;
@@ -140,6 +145,7 @@ let ProjectController = class ProjectController {
                 }
                 project.dockerfile = await (0, utils_1.promptSelect)({
                     message: "Dockerfile",
+                    required: true,
                     options: dockerfiles.map((dockerfile) => {
                         return {
                             value: dockerfile
@@ -163,10 +169,16 @@ let ProjectController = class ProjectController {
                 throw new Error("Invalid project type");
         }
         await this.appEventsService.emit("project:init", project);
-        await project.save();
+        project.save();
     }
     async destroy(name) {
         const project = this.projectService.get(name);
+        await this.projectService.stop(project);
+        this.appConfigService.removeProject(project.id);
+        this.appConfigService.save();
+        this.appConfigService.fs.rm(`projects/${project.id}`, {
+            recursive: true
+        });
     }
     async projectList(all) {
         const table = new cli_table3_1.default({
@@ -190,12 +202,12 @@ let ProjectController = class ProjectController {
     async start(name, detach, attach, rebuild, restart) {
         const project = this.projectService.get(name);
         await this.projectService.start(project, restart, rebuild);
-        if (attach) {
-            await this.dockerService.attach(project.containerName);
-        }
         if (detach) {
             console.info(yoctocolors_cjs_1.default.yellow("Warning: Detach option is deprecated"));
         }
+        if (attach) {
+            await this.dockerService.attach(project.containerName);
+        }
     }
     async stop(name) {
         if (name) {
@@ -225,7 +237,7 @@ let ProjectController = class ProjectController {
         for (const domain of addDomains) {
             project.addDomain(domain);
         }
-        await project.save();
+        project.save();
     }
     async setDomains(domains, name) {
         if (name) {
@@ -236,7 +248,7 @@ let ProjectController = class ProjectController {
         for (const domain of domains) {
             project.addDomain(domain);
         }
-        await project.save();
+        project.save();
     }
     async removeDomain(removeDomains, name) {
         if (name) {
@@ -246,7 +258,7 @@ let ProjectController = class ProjectController {
         for (const domain of removeDomains) {
             project.removeDomain(domain);
         }
-        await project.save();
+        project.save();
     }
     async clearDomain(name) {
         if (name) {
@@ -254,7 +266,7 @@ let ProjectController = class ProjectController {
         }
         const project = this.projectService.get();
         project.clearDomains();
-        await project.save();
+        project.save();
     }
     async ports(name) {
         if (name) {
@@ -275,7 +287,7 @@ let ProjectController = class ProjectController {
         }
         const project = this.projectService.get();
         project.linkPort(parseInt(hostPort), parseInt(containerPort));
-        await project.save();
+        project.save();
     }
     async removePort(hostPort, containerPort, name) {
         if (name) {
@@ -283,7 +295,7 @@ let ProjectController = class ProjectController {
         }
         const project = this.projectService.get();
         project.unlinkPort(parseInt(hostPort), parseInt(containerPort));
-        await project.save();
+        project.save();
     }
     async clearPorts(name) {
         if (name) {
@@ -292,7 +304,7 @@ let ProjectController = class ProjectController {
         const project = this.projectService.get();
         if (project.ports) {
             delete project.ports;
-            await project.save();
+            project.save();
         }
     }
     async configList(name, global) {
@@ -305,7 +317,7 @@ let ProjectController = class ProjectController {
             env = project.env || {};
         }
         else {
-            const config = this.appConfigService.getConfig();
+            const config = this.appConfigService.config;
             env = config.env || {};
         }
         const table = new cli_table3_1.default({
@@ -321,7 +333,7 @@ let ProjectController = class ProjectController {
             this.projectService.cdProject(name);
         }
         let config = global
-            ? this.appConfigService.getConfig()
+            ? this.appConfigService.config
             : this.projectService.get();
         const table = new cli_table3_1.default({
             head: ["KEY", "VALUE"]
@@ -336,27 +348,33 @@ let ProjectController = class ProjectController {
         return table.toString();
     }
     async configSet(variables, name, global) {
-        if (!global && name) {
+        if (global) {
+            for (const variable of variables) {
+                const [key, value] = variable.split("=");
+                if (!value) {
+                    console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
+                    continue;
+                }
+                this.appConfigService.config.setEnv(key.trim(), value.trim());
+            }
+            return;
+        }
+        if (name) {
             this.projectService.cdProject(name);
         }
-        const config = global
-            ? this.appConfigService.getConfig()
-            : this.projectService.get();
+        const project = this.projectService.get();
         for (const variable of variables) {
             const [key, value] = variable.split("=");
             if (!value) {
                 console.info(yoctocolors_cjs_1.default.yellow(`No value for "${key}"`));
                 continue;
             }
-            config.setEnv(key.trim(), value.trim());
+            project.setEnv(key, value);
         }
-        await config.save();
-        if (!global) {
-            const project = this.projectService.get();
-            const container = await this.dockerService.getContainer(project.containerName);
-            if (container) {
-                await this.projectService.start(project, true);
-            }
+        project.save();
+        const container = await this.dockerService.getContainer(project.containerName);
+        if (container) {
+            await this.projectService.start(project, true);
         }
     }
     async configUnset(configs, name, global) {
@@ -375,7 +393,7 @@ let ProjectController = class ProjectController {
         for (const i in env) {
             project.unsetEnv(i);
         }
-        await project.save();
+        project.save();
         if (!global) {
             const project = this.projectService.get();
             const container = await this.dockerService.getContainer(project.containerName);
@@ -414,7 +432,7 @@ let ProjectController = class ProjectController {
         }
         return table.toString();
     }
-    async buildArgsSet(name, args) {
+    async buildArgsSet(args, name) {
         if (name) {
             this.projectService.cdProject(name);
         }
@@ -434,7 +452,7 @@ let ProjectController = class ProjectController {
             }
             project.buildArgs[key] = buildArgs[key];
         }
-        await project.save();
+        project.save();
     }
     async buildArgsUnset(args, name) {
         if (name) {
@@ -456,7 +474,7 @@ let ProjectController = class ProjectController {
                 delete project.buildArgs[key];
             }
         }
-        await project.save();
+        project.save();
     }
     async volumeList(name) {
         if (name) {
@@ -479,7 +497,7 @@ let ProjectController = class ProjectController {
         const project = this.projectService.get();
         if (Array.isArray(volumes) && volumes.length > 0) {
             project.volumeMount(...volumes);
-            await project.save();
+            project.save();
         }
     }
     async volumeUnmount(volumes, name) {
@@ -489,7 +507,7 @@ let ProjectController = class ProjectController {
         const project = this.projectService.get();
         if (Array.isArray(volumes) && volumes.length > 0) {
             project.volumeUnmount(...volumes);
-            await project.save();
+            project.save();
         }
     }
     async extraHostList(name) {
@@ -516,7 +534,7 @@ let ProjectController = class ProjectController {
         }
         const project = this.projectService.get();
         project.addExtraHost(extraHost, extraDomain);
-        await project.save();
+        project.save();
     }
     async removeExtraHost(extraHost, name) {
         if (name) {
@@ -524,7 +542,7 @@ let ProjectController = class ProjectController {
         }
         const project = this.projectService.get();
         project.removeExtraHost(extraHost);
-        await project.save();
+        project.save();
     }
     async attach(name) {
         if (name) {
@@ -571,7 +589,6 @@ let ProjectController = class ProjectController {
             if (clear) {
                 this.logService.clear();
             }
-            const logFilepath = this.appConfigService.dataPath("ws.log");
             const prepareLog = (str) => {
                 return str.replace(/^\[.*]\s([^:]+):\s.*$/gm, (substring, type) => {
                     switch (type) {
@@ -591,26 +608,29 @@ let ProjectController = class ProjectController {
                     }
                 });
             };
-            const stream = makes_1.FS.createReadLinesStream(logFilepath, follow ? -10 : undefined);
-            stream.on("data", (data) => {
-                process.stdout.write(prepareLog(data.toString()));
+            const file = this.appConfigService.fs.open("ws.log", "r");
+            const stream = file.createReadlineStream({
+                start: -10
+            });
+            stream.on("data", (line) => {
+                process.stdout.write(prepareLog(line));
                 process.stdout.write("\n");
             });
             if (follow) {
-                const stats = await makes_1.FS.stat(logFilepath);
-                const watcher = makes_1.FS.watch(logFilepath);
+                const stats = file.stat();
+                const watcher = this.appConfigService.fs.watch("ws.log");
                 const mutex = new async_mutex_1.Mutex();
-                let position = BigInt(stats.size);
+                let position = stats.size;
                 watcher.on("change", async () => {
                     await mutex.acquire();
                     try {
-                        const stats = await makes_1.FS.stat(logFilepath);
-                        if (BigInt(stats.size) < position) {
+                        const stats = file.stat();
+                        if (stats.size < position) {
                             console.info("file truncated");
-                            position = 0n;
+                            position = 0;
                         }
-                        const buffer = await makes_1.FS.readBytes(logFilepath, position);
-                        position += BigInt(buffer.length);
+                        const buffer = file.readBytes(position);
+                        position += buffer.length;
                         process.stdout.write(prepareLog(buffer.toString("utf-8")));
                     }
                     finally {
@@ -921,13 +941,14 @@ __decorate([
 ], ProjectController.prototype, "buildArgsGet", null);
 __decorate([
     (0, core_1.Command)("build-args:set [...buildArgs]"),
-    __param(0, (0, core_1.Option)("name", {
+    __param(0, (0, core_1.Param)("buildArgs")),
+    __param(1, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
         description: "The name of the project"
     })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:paramtypes", [Array, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "buildArgsSet", null);
 __decorate([
@@ -1081,9 +1102,9 @@ __decorate([
 exports.ProjectController = ProjectController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Project commands"),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.AppEventsService,
-        services_1.ProjectService,
-        services_1.LogService,
-        services_1.DockerService])
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        AppEventsService_1.AppEventsService,
+        ProjectService_1.ProjectService,
+        LogService_1.LogService,
+        modules_1.DockerService])
 ], ProjectController);

package/lib/controllers/index.d.ts

@@ -1,8 +1,6 @@
-export * from "./CertController";
 export * from "./CompletionController";
 export * from "./DebugController";
-export * from "./KeystoreController";
+export * from "./ExperimentalController";
 export * from "./PluginController";
 export * from "./PresetController";
 export * from "./ProjectController";
-export * from "./ProxyController";

package/lib/controllers/index.js

@@ -14,11 +14,9 @@ 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("./CertController"), exports);
 __exportStar(require("./CompletionController"), exports);
 __exportStar(require("./DebugController"), exports);
-__exportStar(require("./KeystoreController"), exports);
+__exportStar(require("./ExperimentalController"), exports);
 __exportStar(require("./PluginController"), exports);
 __exportStar(require("./PresetController"), exports);
 __exportStar(require("./ProjectController"), exports);
-__exportStar(require("./ProxyController"), exports);

package/lib/env.d.ts

@@ -1,8 +1,7 @@
-export declare const WOCKER_VERSION = "1.0.22";
+export declare const WOCKER_VERSION = "1.0.23";
 export declare const NODE_ENV: string;
 export declare const ROOT_DIR: string;
 export declare const PRESETS_DIR: string;
-export declare const SERVICES_DIR: string;
 export declare const PLUGINS_DIR: string;
 export declare const DATA_DIR: string;
 export declare const VIRTUAL_HOST_KEY = "VIRTUAL_HOST";

package/lib/env.js

@@ -33,14 +33,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KEYTAR_SERVICE = exports.VIRTUAL_HOST_KEY = exports.DATA_DIR = exports.PLUGINS_DIR = exports.SERVICES_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = exports.WOCKER_VERSION = void 0;
+exports.KEYTAR_SERVICE = exports.VIRTUAL_HOST_KEY = exports.DATA_DIR = exports.PLUGINS_DIR = exports.PRESETS_DIR = exports.ROOT_DIR = exports.NODE_ENV = exports.WOCKER_VERSION = void 0;
 const OS = __importStar(require("os"));
 const Path = __importStar(require("path"));
-exports.WOCKER_VERSION = "1.0.22";
+exports.WOCKER_VERSION = "1.0.23";
 exports.NODE_ENV = process.env.NODE_ENV;
 exports.ROOT_DIR = Path.join(__dirname, "..");
 exports.PRESETS_DIR = Path.join(exports.ROOT_DIR, "presets");
-exports.SERVICES_DIR = Path.join(exports.ROOT_DIR, "services");
 exports.PLUGINS_DIR = Path.join(exports.ROOT_DIR, "plugins");
 exports.DATA_DIR = process.env.WS_DIR || Path.join(OS.homedir(), ".workspace");
 exports.VIRTUAL_HOST_KEY = "VIRTUAL_HOST";

package/lib/main.js

@@ -7,12 +7,13 @@ exports.app = void 0;
 const core_1 = require("@wocker/core");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const AppModule_1 = require("./AppModule");
-const services_1 = require("./services");
+const AppConfigService_1 = require("./services/AppConfigService");
+const LogService_1 = require("./services/LogService");
 exports.app = {
     async run(args) {
         const app = await core_1.Factory.create(AppModule_1.AppModule);
-        const configService = app.get(services_1.AppConfigService);
-        const logger = app.get(services_1.LogService);
+        const configService = app.get(AppConfigService_1.AppConfigService);
+        const logger = app.get(LogService_1.LogService);
         try {
             const res = await app.run(args);
             if (res) {
@@ -25,6 +26,9 @@ exports.app = {
                 return;
             }
             console.error(yoctocolors_cjs_1.default.red(err.message));
+            if (err instanceof core_1.UsageException || err.name === "UsageException") {
+                return;
+            }
             if (err instanceof core_1.CommandNotFoundError) {
                 return;
             }

package/lib/makes/Logger.d.ts

@@ -1,4 +1,4 @@
-import { LogService } from "../services";
+import { LogService } from "../services/LogService";
 declare class Logger {
     static install(ls: LogService): void;
     static log(...data: any[]): void;

package/lib/makes/Plugin.d.ts

@@ -1,4 +1,3 @@
-import "reflect-metadata";
 export declare class Plugin {
     readonly type: any;
     readonly name: string;

package/lib/makes/Plugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plugin = void 0;
-require("reflect-metadata");
 const core_1 = require("@wocker/core");
 class Plugin {
     constructor(type) {

package/lib/makes/index.d.ts

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

package/lib/makes/index.js

@@ -14,7 +14,6 @@ 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("./FS"), exports);
 __exportStar(require("./Http"), exports);
 __exportStar(require("./Logger"), exports);
 __exportStar(require("./Plugin"), exports);

package/lib/modules/app/index.d.ts

@@ -0,0 +1,2 @@
+export declare class AppModule {
+}

package/lib/modules/app/index.js

@@ -0,0 +1,16 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppModule = void 0;
+const core_1 = require("@wocker/core");
+let AppModule = class AppModule {
+};
+exports.AppModule = AppModule;
+exports.AppModule = AppModule = __decorate([
+    (0, core_1.Module)({})
+], AppModule);

package/lib/modules/docker/index.d.ts

@@ -0,0 +1,8 @@
+import { ContainerService } from "./services/ContainerService";
+import { ImageService } from "./services/ImageService";
+import { DockerService } from "./services/DockerService";
+import { ModemService } from "./services/ModemService";
+import { ProtoService } from "./services/ProtoService";
+export declare class DockerModule {
+}
+export { ContainerService, ImageService, DockerService, ModemService, ProtoService };

package/lib/modules/docker/index.js

@@ -0,0 +1,41 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtoService = exports.ModemService = exports.DockerService = exports.ImageService = exports.ContainerService = exports.DockerModule = void 0;
+const core_1 = require("@wocker/core");
+const ContainerService_1 = require("./services/ContainerService");
+Object.defineProperty(exports, "ContainerService", { enumerable: true, get: function () { return ContainerService_1.ContainerService; } });
+const ImageService_1 = require("./services/ImageService");
+Object.defineProperty(exports, "ImageService", { enumerable: true, get: function () { return ImageService_1.ImageService; } });
+const DockerService_1 = require("./services/DockerService");
+Object.defineProperty(exports, "DockerService", { enumerable: true, get: function () { return DockerService_1.DockerService; } });
+const ModemService_1 = require("./services/ModemService");
+Object.defineProperty(exports, "ModemService", { enumerable: true, get: function () { return ModemService_1.ModemService; } });
+const ProtoService_1 = require("./services/ProtoService");
+Object.defineProperty(exports, "ProtoService", { enumerable: true, get: function () { return ProtoService_1.ProtoService; } });
+let DockerModule = class DockerModule {
+};
+exports.DockerModule = DockerModule;
+exports.DockerModule = DockerModule = __decorate([
+    (0, core_1.Module)({
+        providers: [
+            ContainerService_1.ContainerService,
+            ImageService_1.ImageService,
+            DockerService_1.DockerService,
+            ModemService_1.ModemService,
+            ProtoService_1.ProtoService
+        ],
+        exports: [
+            ContainerService_1.ContainerService,
+            ImageService_1.ImageService,
+            DockerService_1.DockerService,
+            ModemService_1.ModemService,
+            ProtoService_1.ProtoService
+        ]
+    })
+], DockerModule);

package/lib/modules/docker/services/ContainerService.d.ts

@@ -0,0 +1,14 @@
+import { LogService, DockerServiceParams as Params } from "@wocker/core";
+import type Docker from "dockerode";
+import { Duplex } from "stream";
+import type { Container } from "dockerode";
+import { ModemService } from "./ModemService";
+export declare class ContainerService {
+    protected readonly logService: LogService;
+    protected readonly modemService: ModemService;
+    constructor(logService: LogService, modemService: ModemService);
+    get docker(): Docker;
+    get(name: string): Promise<Container>;
+    rm(name: string): Promise<void>;
+    exec(nameOrContainer: string | Container, options: Params.Exec | string[], _tty?: boolean): Promise<Duplex>;
+}