@wocker/ws 1.0.31 → 1.1.0

package/lib/AppModule.js

@@ -69,8 +69,7 @@ exports.AppModule = AppModule = __decorate([
             modules_1.PresetRepository,
             modules_1.PresetService,
             modules_1.ProjectService,
-            core_1.ProcessService,
-            modules_1.ProjectRepository
+            core_1.ProcessService
         ]
     })
 ], AppModule);

package/lib/main.js

@@ -8,7 +8,7 @@ const core_1 = require("@wocker/core");
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const AppModule_1 = require("./AppModule");
 (async () => {
-    const context = await core_1.Factory.create(AppModule_1.AppModule), appConfigService = context.get(core_1.AppConfigService), logService = context.get(core_1.LogService);
+    const context = await core_1.Factory.create(AppModule_1.AppModule), appService = context.get(core_1.AppService), logService = context.get(core_1.LogService);
     try {
         const res = await context.run(process.argv);
         if (res) {
@@ -27,7 +27,7 @@ const AppModule_1 = require("./AppModule");
         if (err instanceof core_1.CommandNotFoundError) {
             return;
         }
-        if (appConfigService.debug) {
+        if (appService.debug) {
             logService.error(err.stack || err.toString());
         }
     }

package/lib/makes/GithubClient.d.ts

@@ -1,4 +1,4 @@
-import { AxiosInstance } from "axios";
+import { Http } from "@wocker/utils";
 type RepositoryInfo = {
     default_branch: string;
 };
@@ -24,7 +24,8 @@ export declare class GithubClient {
     readonly owner: string;
     readonly repository: string;
     constructor(owner: string, repository: string);
-    get axios(): AxiosInstance;
+    get client(): Http;
+    get contentClient(): Http;
     getInfo(): Promise<RepositoryInfo>;
     getBranches(): Promise<GithubBranch[]>;
     getTags(): Promise<GithubTag[]>;

package/lib/makes/GithubClient.js

@@ -1,54 +1,54 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GithubClient = void 0;
-const axios_1 = __importDefault(require("axios"));
 const core_1 = require("@wocker/core");
+const utils_1 = require("@wocker/utils");
 class GithubClient {
     constructor(owner, repository) {
         this.owner = owner;
         this.repository = repository;
     }
-    get axios() {
-        return axios_1.default.create({
+    get client() {
+        return utils_1.Http.base("https://api.github.com", {
             headers: {
                 "User-Agent": "Wocker"
             }
         });
     }
-    async getInfo() {
-        const response = await this.axios.get(`https://api.github.com/repos/${this.owner}/${this.repository}`, {
+    get contentClient() {
+        return utils_1.Http.base("https://raw.githubusercontent.com", {
             headers: {
-                "Accept": "application/vnd.github+json"
+                "User-Agent": "Wocker"
             }
         });
-        return response.data;
+    }
+    async getInfo() {
+        return this.contentClient.get(`/repos/${this.owner}/${this.repository}`)
+            .withHeader("Accept", "application/vnd.github+json")
+            .expectStatus(200)
+            .json();
     }
     async getBranches() {
-        const response = await this.axios
-            .get(`https://api.github.com/repos/${this.owner}/${this.repository}/branches`);
-        return response.data;
+        return this.client
+            .get(`/repos/${this.owner}/${this.repository}/branches`)
+            .expectStatus(200)
+            .json();
     }
     async getTags() {
-        const response = await this.axios
-            .get(`https://api.github.com/repos/${this.owner}/${this.repository}/tags`);
-        return response.data;
+        return this.client
+            .get(`/repos/${this.owner}/${this.repository}/tags`)
+            .expectStatus(200)
+            .json();
     }
     async getFile(ref, path) {
-        const res = await this.axios
-            .get(`https://raw.githubusercontent.com/${this.owner}/${this.repository}/${ref}/${path}`, {
-            headers: {
-                "Accept": "application/vnd.github+json"
-            }
-        });
-        return res.data;
+        return this.contentClient
+            .get(`/${this.owner}/${this.repository}/${ref}/${path}`)
+            .withHeader("Accept", "application/vnd.github+json")
+            .expectStatus(200)
+            .json();
     }
     async downloadZipByUrl(url, dirPath) {
-        const res = await this.axios.get(url, {
-            responseType: "stream"
-        });
+        const res = await utils_1.Http.base(url).expectStatus(200).send();
         const fs = new core_1.FileSystem(dirPath);
         if (!fs.exists()) {
             fs.mkdir("", {
@@ -56,7 +56,7 @@ class GithubClient {
             });
         }
         return new Promise((resolve, reject) => {
-            const { Parse } = require("unzipper"), pipe = res.data.pipe(Parse());
+            const { Parse } = require("unzipper"), pipe = res.pipe(Parse());
             pipe.on("entry", (entry) => {
                 const path = entry.path.replace(/^[^\/]+\//, "");
                 if (entry.type === "File") {

package/lib/makes/index.d.ts

@@ -1,4 +1 @@
-export * from "./Http";
 export * from "./Plugin";
-export * from "./Version";
-export * from "./VersionRule";

package/lib/makes/index.js

@@ -14,7 +14,4 @@ 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("./Http"), exports);
 __exportStar(require("./Plugin"), exports);
-__exportStar(require("./Version"), exports);
-__exportStar(require("./VersionRule"), exports);

package/lib/modules/core/controllers/DebugController.d.ts

@@ -1,11 +1,10 @@
-import { LogService, AppConfigService } from "@wocker/core";
+import { LogService, AppService } from "@wocker/core";
 export declare class DebugController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly logService: LogService;
-    constructor(appConfigService: AppConfigService, logService: LogService);
+    constructor(appService: AppService, logService: LogService);
     debug(): Promise<string>;
     setDebug(status: string): Promise<void>;
-    setLog(level: string): Promise<void>;
     testLog(level: string, args: string[]): Promise<void>;
     debugCompletion(): Promise<string[]>;
     getLevels(): string[];

package/lib/modules/core/controllers/DebugController.js

@@ -15,24 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebugController = void 0;
 const core_1 = require("@wocker/core");
 let DebugController = class DebugController {
-    constructor(appConfigService, logService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, logService) {
+        this.appService = appService;
         this.logService = logService;
     }
     async debug() {
-        return this.appConfigService.debug ? "on" : "off";
+        return this.appService.debug ? "on" : "off";
     }
     async setDebug(status) {
-        this.appConfigService.debug = status === "on";
-        this.appConfigService.save();
-    }
-    async setLog(level) {
-        const validLevels = this.getLevels();
-        if (!validLevels.includes(level)) {
-            throw new Error(`Invalid log level: ${level}. Valid options are ${validLevels.join(', ')}`);
-        }
-        this.appConfigService.config.logLevel = level;
-        this.appConfigService.save();
+        this.appService.debug = status === "on";
     }
     async testLog(level, args) {
         this.logService._log(level, ...args);
@@ -59,14 +50,6 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], DebugController.prototype, "setDebug", null);
-__decorate([
-    (0, core_1.Description)("Set the log level (options: debug, log, info, warn, error)"),
-    (0, core_1.Command)("loglevel <level>"),
-    __param(0, (0, core_1.Param)("level")),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], DebugController.prototype, "setLog", null);
 __decorate([
     (0, core_1.Command)("log:<level> [...args]"),
     __param(0, (0, core_1.Param)("level")),
@@ -89,6 +72,6 @@ __decorate([
 ], DebugController.prototype, "getLevels", null);
 exports.DebugController = DebugController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.LogService])
 ], DebugController);

package/lib/modules/core/controllers/ExperimentalController.d.ts

@@ -1,7 +1,7 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 export declare class ExperimentalController {
-    protected readonly appService: AppConfigService;
-    constructor(appService: AppConfigService);
+    protected readonly appService: AppService;
+    constructor(appService: AppService);
     enable(feature?: string): void;
     disable(feature?: string): void;
     getFeatures(): string[];

package/lib/modules/core/controllers/ExperimentalController.js

@@ -72,5 +72,5 @@ __decorate([
 exports.ExperimentalController = ExperimentalController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Manage experimental features"),
-    __metadata("design:paramtypes", [core_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppService])
 ], ExperimentalController);

package/lib/modules/dns/index.js

@@ -20,9 +20,9 @@ let DnsModule = DnsModule_1 = class DnsModule {
     static register() {
         return {
             module: DnsModule_1,
-            inject: [core_1.AppConfigService],
-            useFactory: (appConfigService) => {
-                if (!appConfigService.isExperimentalEnabled("dns")) {
+            inject: [core_1.AppService],
+            useFactory: (appService) => {
+                if (!appService.isExperimentalEnabled("dns")) {
                     return {};
                 }
                 return {

package/lib/modules/keystore/controllers/KeystoreController.d.ts

@@ -1,8 +1,8 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { KeystoreService } from "../services/KeystoreService";
 export declare class KeystoreController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly keystoreService: KeystoreService;
-    constructor(appConfigService: AppConfigService, keystoreService: KeystoreService);
+    constructor(appService: AppService, keystoreService: KeystoreService);
     init(provider?: string): Promise<void>;
 }

package/lib/modules/keystore/controllers/KeystoreController.js

@@ -14,28 +14,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeystoreController = void 0;
 const core_1 = require("@wocker/core");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const KeystoreService_1 = require("../services/KeystoreService");
 let KeystoreController = class KeystoreController {
-    constructor(appConfigService, keystoreService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, keystoreService) {
+        this.appService = appService;
         this.keystoreService = keystoreService;
     }
     async init(provider) {
         if (!provider) {
-            provider = await (0, utils_1.promptSelect)({
+            provider = await (0, prompts_1.promptSelect)({
                 required: true,
                 message: "Keystore provider",
                 type: "text",
                 options: ["file", "keytar"],
-                default: this.appConfigService.config.keystore
+                default: this.appService.config.keystore
             });
         }
         if (!this.keystoreService.hasProvider(provider)) {
             throw new Error(`Provider "${provider}" not found`);
         }
-        this.appConfigService.config.keystore = provider;
-        this.appConfigService.save();
+        this.appService.config.keystore = provider;
+        this.appService.save();
     }
 };
 exports.KeystoreController = KeystoreController;
@@ -51,6 +51,6 @@ __decorate([
 exports.KeystoreController = KeystoreController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Keystore commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         KeystoreService_1.KeystoreService])
 ], KeystoreController);

package/lib/modules/keystore/providers/FileKeystoreProvider.js

@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileKeystoreProvider = void 0;
 const core_1 = require("@wocker/core");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const FileKeystore_1 = require("../types/FileKeystore");
-const utils_2 = require("../utils");
+const utils_1 = require("../utils");
 let FileKeystoreProvider = class FileKeystoreProvider extends core_1.KeystoreProvider {
     constructor(fs) {
         super();
@@ -50,24 +50,24 @@ let FileKeystoreProvider = class FileKeystoreProvider extends core_1.KeystorePro
     }
     async getEncryptionKey() {
         if (!this.encryptionKey) {
-            const password = await (0, utils_1.promptInput)({
+            const password = await (0, prompts_1.promptInput)({
                 required: true,
                 min: 6,
                 max: 32,
                 message: "Keystore password",
                 type: "password",
                 validate: async (value) => {
-                    if (typeof value !== "string" || !this.passwordHash || (0, utils_2.verifyPasswordHash)(value, this.passwordHash)) {
+                    if (typeof value !== "string" || !this.passwordHash || (0, utils_1.verifyPasswordHash)(value, this.passwordHash)) {
                         return true;
                     }
                     return "Invalid password";
                 }
             });
             if (!this.keystore.passwordHash) {
-                this.keystore.passwordHash = (0, utils_2.createPasswordHash)(password);
+                this.keystore.passwordHash = (0, utils_1.createPasswordHash)(password);
                 this.keystore.save();
             }
-            this.encryptionKey = (0, utils_2.createEncryptionKey)(password, this.keystore.passwordHash);
+            this.encryptionKey = (0, utils_1.createEncryptionKey)(password, this.keystore.passwordHash);
         }
         return this.encryptionKey;
     }
@@ -77,11 +77,11 @@ let FileKeystoreProvider = class FileKeystoreProvider extends core_1.KeystorePro
             return defaultValue;
         }
         const encryptionKey = await this.getEncryptionKey();
-        return (0, utils_2.decrypt)(encryptionKey, value);
+        return (0, utils_1.decrypt)(encryptionKey, value);
     }
     async set(key, value) {
         const encryptionKey = await this.getEncryptionKey();
-        this.keystore.set(key, (0, utils_2.encrypt)(encryptionKey, value));
+        this.keystore.set(key, (0, utils_1.encrypt)(encryptionKey, value));
         this.keystore.save();
     }
     async delete(key) {

package/lib/modules/keystore/services/KeystoreService.d.ts

@@ -1,9 +1,9 @@
-import { AppConfigService, AppFileSystemService, KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
+import { AppService, AppFileSystemService, KeystoreService as CoreKeystoreService, KeystoreProvider } from "@wocker/core";
 export declare class KeystoreService extends CoreKeystoreService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly fs: AppFileSystemService;
     protected providers: Map<string, KeystoreProvider>;
-    constructor(appConfigService: AppConfigService, fs: AppFileSystemService);
+    constructor(appService: AppService, fs: AppFileSystemService);
     hasProvider(name: string): boolean;
     provider(name?: string): KeystoreProvider;
     get(keys: string | string[], byDefault?: string): Promise<string | undefined>;

package/lib/modules/keystore/services/KeystoreService.js

@@ -14,9 +14,9 @@ const core_1 = require("@wocker/core");
 const KeytarKeystoreProvider_1 = require("../providers/KeytarKeystoreProvider");
 const FileKeystoreProvider_1 = require("../providers/FileKeystoreProvider");
 let KeystoreService = class KeystoreService extends core_1.KeystoreService {
-    constructor(appConfigService, fs) {
+    constructor(appService, fs) {
         super();
-        this.appConfigService = appConfigService;
+        this.appService = appService;
         this.fs = fs;
         this.providers = new Map();
     }
@@ -25,7 +25,7 @@ let KeystoreService = class KeystoreService extends core_1.KeystoreService {
     }
     provider(name) {
         if (!name) {
-            name = this.appConfigService.config.keystore;
+            name = this.appService.config.keystore;
         }
         if (!name) {
             name = "file";
@@ -70,6 +70,6 @@ let KeystoreService = class KeystoreService extends core_1.KeystoreService {
 exports.KeystoreService = KeystoreService;
 exports.KeystoreService = KeystoreService = __decorate([
     (0, core_1.Injectable)("KEYSTORE_SERVICE"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         core_1.AppFileSystemService])
 ], KeystoreService);

package/lib/modules/package-manager/service/PackageManager.d.ts

@@ -1,8 +1,8 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { PackageManagerProvider } from "../types/PackageManagerProvider";
 export declare class PackageManager {
-    protected readonly appConfigService: AppConfigService;
-    constructor(appConfigService: AppConfigService);
+    protected readonly appService: AppService;
+    constructor(appService: AppService);
     getManager(): Promise<PackageManagerProvider>;
     getPackages(global?: boolean): Promise<import("../types/Package").Package[]>;
     install(name: string, version?: string): Promise<void>;

package/lib/modules/package-manager/service/PackageManager.js

@@ -11,17 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageManager = void 0;
 const core_1 = require("@wocker/core");
-const utils_1 = require("@wocker/utils");
+const prompts_1 = require("@wocker/prompts");
 const NpmProvider_1 = require("../providers/NpmProvider");
 const PnpmProvider_1 = require("../providers/PnpmProvider");
 const YarnProvider_1 = require("../providers/YarnProvider");
 let PackageManager = class PackageManager {
-    constructor(appConfigService) {
-        this.appConfigService = appConfigService;
+    constructor(appService) {
+        this.appService = appService;
     }
     async getManager() {
-        if (!this.appConfigService.config.pm) {
-            this.appConfigService.config.pm = await (0, utils_1.promptSelect)({
+        if (!this.appService.config.pm) {
+            this.appService.config.pm = await (0, prompts_1.promptSelect)({
                 label: "Package manager:",
                 options: [
                     {
@@ -39,9 +39,9 @@ let PackageManager = class PackageManager {
                 ],
                 required: true
             });
-            this.appConfigService.save();
+            this.appService.save();
         }
-        switch (this.appConfigService.config.pm) {
+        switch (this.appService.config.pm) {
             case "npm":
                 return new NpmProvider_1.NpmProvider();
             case "pnpm":
@@ -66,5 +66,5 @@ let PackageManager = class PackageManager {
 exports.PackageManager = PackageManager;
 exports.PackageManager = PackageManager = __decorate([
     (0, core_1.Injectable)("PACKAGE_MANAGER_SERVICE"),
-    __metadata("design:paramtypes", [core_1.AppConfigService])
+    __metadata("design:paramtypes", [core_1.AppService])
 ], PackageManager);

package/lib/modules/package-manager/service/RegistryService.js

@@ -8,18 +8,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistryService = void 0;
 const core_1 = require("@wocker/core");
-const makes_1 = require("../../../makes");
+const utils_1 = require("@wocker/utils");
 let RegistryService = class RegistryService {
     async getPackageInfo(name) {
-        const res = await makes_1.Http.get("https://registry.npmjs.org")
-            .send(name);
+        const res = await utils_1.Http.base("https://registry.npmjs.org")
+            .get(name)
+            .send();
         if (res.status === 404) {
             throw new Error("Package not found");
         }
         if (res.status !== 200) {
             throw new Error("Network error");
         }
-        return res.data;
+        return res.json();
     }
 };
 exports.RegistryService = RegistryService;

package/lib/modules/plugin/controllers/PluginController.d.ts

@@ -1,9 +1,9 @@
-import { AppConfigService } from "@wocker/core";
+import { AppService } from "@wocker/core";
 import { PluginService } from "../services/PluginService";
 export declare class PluginController {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly pluginService: PluginService;
-    constructor(appConfigService: AppConfigService, pluginService: PluginService);
+    constructor(appService: AppService, pluginService: PluginService);
     list(): Promise<string>;
     add(names: string[]): Promise<void>;
     remove(names: string[]): Promise<void>;

package/lib/modules/plugin/controllers/PluginController.js

@@ -16,8 +16,8 @@ exports.PluginController = void 0;
 const core_1 = require("@wocker/core");
 const PluginService_1 = require("../services/PluginService");
 let PluginController = class PluginController {
-    constructor(appConfigService, pluginService) {
-        this.appConfigService = appConfigService;
+    constructor(appService, pluginService) {
+        this.appService = appService;
         this.pluginService = pluginService;
     }
     async list() {
@@ -38,7 +38,7 @@ let PluginController = class PluginController {
         await this.pluginService.update();
     }
     getInstalledPlugins() {
-        return this.appConfigService.plugins.map(pluginRef => pluginRef.name);
+        return this.appService.plugins.map(pluginRef => pluginRef.name);
     }
 };
 exports.PluginController = PluginController;
@@ -82,6 +82,6 @@ __decorate([
 exports.PluginController = PluginController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Plugin commands"),
-    __metadata("design:paramtypes", [core_1.AppConfigService,
+    __metadata("design:paramtypes", [core_1.AppService,
         PluginService_1.PluginService])
 ], PluginController);

package/lib/modules/plugin/index.js

@@ -18,14 +18,14 @@ let PluginModule = PluginModule_1 = class PluginModule {
         return {
             module: PluginModule_1,
             inject: [
-                core_1.AppConfigService,
+                core_1.AppService,
                 core_1.AppFileSystemService,
                 core_1.LogService,
                 PluginService_1.PluginService
             ],
-            useFactory: async (appConfigService, fs, logService, pluginService) => {
+            useFactory: async (appService, fs, logService, pluginService) => {
                 const imports = [];
-                for (const pluginData of appConfigService.plugins) {
+                for (const pluginData of appService.plugins) {
                     try {
                         const plugin = await pluginService.import(pluginData.name);
                         imports.push({
@@ -43,8 +43,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
                             pluginName: pluginData.name,
                             pluginEnv: pluginData.env
                         });
-                        appConfigService.removePlugin(pluginData.name);
-                        appConfigService.save();
+                        appService.removePlugin(pluginData.name);
                     }
                 }
                 return {

package/lib/modules/plugin/services/PluginService.d.ts

@@ -1,14 +1,14 @@
-import { Cli, AppConfigService, LogService } from "@wocker/core";
+import { Cli, AppService, LogService } from "@wocker/core";
 import { PackageManager, RegistryService } from "../../package-manager";
 import { Plugin } from "../../../makes";
 export declare class PluginService {
-    protected readonly appConfigService: AppConfigService;
+    protected readonly appService: AppService;
     protected readonly pm: PackageManager;
     protected readonly registryService: RegistryService;
     protected readonly logService: LogService;
     protected readonly cli: Cli;
     protected rule: string;
-    constructor(appConfigService: AppConfigService, pm: PackageManager, registryService: RegistryService, logService: LogService, cli: Cli);
+    constructor(appService: AppService, pm: PackageManager, registryService: RegistryService, logService: LogService, cli: Cli);
     getPluginsTable(): string;
     checkPlugin(pluginName: string): Promise<boolean>;
     install(pluginName: string, version?: string): Promise<void>;