@tsed/cli-core 7.5.0-rc.2 → 7.5.0-rc.3

package/lib/esm/CliCore.js

@@ -81,7 +81,6 @@ export class CliCore {
         try {
             const cliService = inject(CliService);
             constant("plugins") && (await loadPlugins());
-            await $asyncEmit("$beforeInit");
             await injector().load();
             await $asyncEmit("$afterInit");
             injector().settings.set("loaded", true);

package/lib/esm/services/CliHttpClient.js

@@ -9,39 +9,38 @@ export class CliHttpClient extends CliHttpLogClient {
     constructor() {
         super(...arguments);
         this.cliProxyAgent = inject(CliProxyAgent);
+        this.proxySettingsInitialized = false;
     }
     static getParamsSerializer(params) {
         return stringify(cleanObject(params));
     }
-    async $afterInit() {
-        await this.cliProxyAgent.resolveProxySettings();
-    }
     async head(endpoint, options = {}) {
-        const { headers } = await axios(this.getRequestParameters("HEAD", endpoint, options));
+        const { headers } = await axios(await this.getRequestParameters("HEAD", endpoint, options));
         return headers;
     }
     async get(endpoint, options = {}) {
-        const result = await this.send(this.getRequestParameters("GET", endpoint, options));
+        const result = await this.send(await this.getRequestParameters("GET", endpoint, options));
         return this.mapResponse(result, options);
     }
     async post(endpoint, options = {}) {
-        const result = await this.send(this.getRequestParameters("POST", endpoint, options));
+        const result = await this.send(await this.getRequestParameters("POST", endpoint, options));
         return this.mapResponse(result, options);
     }
     async put(endpoint, options = {}) {
-        const result = await this.send(this.getRequestParameters("PUT", endpoint, options));
+        const result = await this.send(await this.getRequestParameters("PUT", endpoint, options));
         return this.mapResponse(result, options);
     }
     async patch(endpoint, options = {}) {
-        const result = await this.send(this.getRequestParameters("PATCH", endpoint, options));
+        const result = await this.send(await this.getRequestParameters("PATCH", endpoint, options));
         return this.mapResponse(result, options);
     }
     async delete(endpoint, options = {}) {
-        const result = await this.send(this.getRequestParameters("DELETE", endpoint, options));
+        const result = await this.send(await this.getRequestParameters("DELETE", endpoint, options));
         return this.mapResponse(result, options);
     }
-    getRequestParameters(method, endpoint, options) {
+    async getRequestParameters(method, endpoint, options) {
         const url = (this.host || "") + endpoint.replace(this.host || "", "");
+        await this.resolveProxySettingsOnce();
         options = {
             method,
             ...options,
@@ -54,20 +53,36 @@ export class CliHttpClient extends CliHttpLogClient {
                 ...(options.headers || {})
             }
         };
-        this.configureProxy(url, options);
+        await this.configureProxy(url, options);
         return options;
     }
-    configureProxy(endpoint, options) {
+    async resolveProxySettingsOnce() {
+        if (this.proxySettingsInitialized) {
+            return;
+        }
+        if (!this.proxySettingsPromise) {
+            this.proxySettingsPromise = this.cliProxyAgent
+                .resolveProxySettings()
+                .catch(() => {
+                return;
+            })
+                .finally(() => {
+                this.proxySettingsInitialized = true;
+            });
+        }
+        await this.proxySettingsPromise;
+    }
+    async configureProxy(endpoint, options) {
         const url = new URL(endpoint);
         if (this.cliProxyAgent.hasProxy()) {
             const protocol = url.protocol.replace(":", "");
             switch (protocol) {
                 case "https":
-                    options.httpsAgent = this.cliProxyAgent.get(protocol);
+                    options.httpsAgent = await this.cliProxyAgent.get(protocol);
                     options.proxy = false;
                     break;
                 case "http":
-                    options.httpAgent = this.cliProxyAgent.get(protocol);
+                    options.httpAgent = await this.cliProxyAgent.get(protocol);
                     options.proxy = false;
                     break;
                 default:

package/lib/esm/services/CliProxyAgent.js

@@ -10,14 +10,12 @@ export class CliProxyAgent {
         this.projectPackageJson = inject(ProjectPackageJson);
         this.cliExeca = inject(CliExeca);
     }
-    async $onInit() {
-        this.tunnel = await import("tunnel");
-    }
     hasProxy() {
         return !!this.proxySettings.value.url;
     }
-    get(type) {
+    async get(type) {
         if (this.hasProxy()) {
+            const tunnel = await import("tunnel");
             const { strictSsl = true } = this.proxySettings.value;
             const url = new URL(this.proxySettings.value.url);
             const protocol = url.protocol.replace(":", "");
@@ -30,8 +28,8 @@ export class CliProxyAgent {
                 }
             };
             const method = camelCase([type, "over", protocol].join(" "));
-            if (this.tunnel[method]) {
-                return this.tunnel[method](options);
+            if (tunnel[method]) {
+                return tunnel[method](options);
             }
         }
         return null;

package/lib/types/services/CliHttpClient.d.ts

@@ -8,16 +8,18 @@ export interface CliHttpClientOptions extends AxiosRequestConfig, Record<string,
 export declare class CliHttpClient extends CliHttpLogClient {
     protected cliProxyAgent: CliProxyAgent;
     protected host: string;
+    private proxySettingsInitialized;
+    private proxySettingsPromise?;
     static getParamsSerializer(params: any): string;
-    $afterInit(): Promise<void>;
     head<T = Record<string, any>>(endpoint: string, options?: CliHttpClientOptions): Promise<T>;
     get<T = unknown>(endpoint: string, options?: CliHttpClientOptions): Promise<T>;
     post<T = unknown>(endpoint: string, options?: CliHttpClientOptions): Promise<T>;
     put<T = any>(endpoint: string, options?: CliHttpClientOptions): Promise<T>;
     patch<T = any>(endpoint: string, options?: CliHttpClientOptions): Promise<T>;
     delete<T = any>(endpoint: string, options?: CliHttpClientOptions): Promise<T>;
-    protected getRequestParameters(method: Method, endpoint: string, options: CliHttpClientOptions): CliHttpClientOptions;
-    protected configureProxy(endpoint: string, options: CliHttpClientOptions): void;
+    protected getRequestParameters(method: Method, endpoint: string, options: CliHttpClientOptions): Promise<CliHttpClientOptions>;
+    private resolveProxySettingsOnce;
+    protected configureProxy(endpoint: string, options: CliHttpClientOptions): Promise<void>;
     protected send(options: AxiosRequestConfig): Promise<import("axios").AxiosResponse<any, any, {}>>;
     protected mapResponse(result: any, options: CliHttpClientOptions): any;
 }

package/lib/types/services/CliProxyAgent.d.ts

@@ -10,9 +10,7 @@ export declare class CliProxyAgent {
     };
     protected projectPackageJson: ProjectPackageJson;
     protected cliExeca: CliExeca;
-    protected tunnel: typeof import("tunnel");
-    $onInit(): Promise<void>;
     hasProxy(): boolean;
-    get(type: "http" | "https"): any;
+    get(type: "http" | "https"): Promise<any>;
     resolveProxySettings(): Promise<void>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "7.5.0-rc.2",
+  "version": "7.5.0-rc.3",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -33,8 +33,8 @@
   ],
   "dependencies": {
     "@ts-morph/common": "0.28.0",
-    "@tsed/cli-prompts": "7.5.0-rc.2",
-    "@tsed/cli-tasks": "7.5.0-rc.2",
+    "@tsed/cli-prompts": "7.5.0-rc.3",
+    "@tsed/cli-tasks": "7.5.0-rc.3",
     "@tsed/logger": ">=8.0.3",
     "@tsed/logger-pattern-layout": ">=8.0.3",
     "@tsed/logger-std": ">=8.0.3",
@@ -62,7 +62,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "7.5.0-rc.2",
+    "@tsed/typescript": "7.5.0-rc.3",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",