@cloud-cli/px 4.4.2 → 4.4.4

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { help, init } from "@cloud-cli/cli";
-import { DomainAndTarget, DomainName, Proxy, WithOptionalProps } from "./types.js";
+import { help, init } from '@cloud-cli/cli';
+import { DomainAndTarget, DomainName, Proxy, WithOptionalProps } from './types.js';
 declare const _default: {
     add(options: WithOptionalProps<Proxy>): Promise<Proxy>;
     remove(options: WithOptionalProps<DomainAndTarget>): Promise<boolean>;
@@ -8,6 +8,7 @@ declare const _default: {
     get(options: DomainName): Promise<Proxy[]>;
     domains(): Promise<string[]>;
     reload(): Promise<void>;
+    restart(): Promise<void>;
     [init](): Promise<import("@cloud-cli/proxy").ProxyServer>;
     [help](): string;
 };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { help, init, logInfo } from "@cloud-cli/cli";
-import { ProxyManager } from "./proxy-manager.js";
+import { help, init, logInfo } from '@cloud-cli/cli';
+import { ProxyManager } from './proxy-manager.js';
 const manager = new ProxyManager();
 export default {
     async add(options) {
@@ -21,25 +21,35 @@ export default {
         return manager.getDomainList();
     },
     async reload() {
-        logInfo("Reloading proxy server");
+        logInfo('Reloading proxy configuration');
         return await manager.reload();
     },
+    async restart() {
+        logInfo('Restarting server');
+        return await manager.restart();
+    },
     async [init]() {
-        await manager.reload();
+        await manager.restart();
         return manager.server;
     },
     [help]() {
         return `Manages reverse proxy entries
 
 Available commands:
-  px.add --domain <domain> --target <url> [--cors] [--redirect] [--preserveHost] [--redirectUrl <url>] [--headers <headers>] [--authorization <value>] - Add an entry
-  px.remove --domain <domain> - Remove an entry
-  px.update --domain <domain> [proxy options] - Update an entry
-  px.list [--domain <domain>] [--target <url>] [proxy options] - List matching entries
-  px.get --domain <domain> - Get entries for a domain
-  px.domains - List configured domains
-  px.reload - Reload all proxy entries
+  px.add
+  px.update
+    --domain <domain> <proxy options>
+  px.remove
+    --domain <domain>
+  px.list
+    [--domain <domain>] <proxy options>
+  px.get
+    --domain <domain>
+  px.domains
+  px.reload
+  px.restart
 
-Proxy options: domain, target, cors, redirect, preserveHost, redirectUrl, headers, authorization`;
+Proxy options:
+  --target <url> [--cors] [--redirect] [--preserveHost] [--redirectUrl <url>] [--headers <headers>] [--authorization <value>]`;
     },
 };

package/dist/proxy-manager.d.ts

@@ -9,6 +9,8 @@ export declare class ProxyManager {
     getProxyListWithContainers(): Promise<Proxy[]>;
     getProxyList(filters?: Partial<Proxy>): Promise<Proxy[]>;
     getProxyListForDomain(options: WithOptionalProps<DomainName>): Promise<Proxy[]>;
+    restart(): Promise<void>;
     reload(): Promise<void>;
+    private loadProxy;
     getRunningContainers(): Promise<DockerContainer[]>;
 }

package/dist/proxy-manager.js

@@ -1,4 +1,4 @@
-import { getStorage, getConfig } from '@cloud-cli/cli';
+import { getStorage, getConfig, logInfo, logError } from '@cloud-cli/cli';
 import { ProxyEntry, ProxyServer, ProxySettings } from '@cloud-cli/proxy';
 import { exec } from '@cloud-cli/exec';
 const defaultOptions = {
@@ -125,29 +125,37 @@ export class ProxyManager {
         const all = await this.getProxyListWithContainers();
         return all.filter((p) => p.domain.includes(options.domain));
     }
+    async restart() {
+        await px.reset();
+        await px.start();
+        await this.reload();
+    }
     async reload() {
         const all = await this.getProxyListWithContainers();
-        px.reset();
+        px.resetProxies();
         for (const t of all) {
-            try {
-                const [domain, path = ''] = t.domain.split('/');
-                px.add(new ProxyEntry({
-                    domain,
-                    path,
-                    target: t.target,
-                    redirectToHttps: t.redirect,
-                    redirectToUrl: t.redirectUrl,
-                    cors: t.cors,
-                    headers: t.headers,
-                    authorization: t.authorization,
-                    preserveHost: t.preserveHost,
-                }));
-            }
-            catch (error) {
-                console.log(`Error adding proxy for ${t.domain}:`, error);
-            }
+            this.loadProxy(t);
+        }
+    }
+    loadProxy(t) {
+        try {
+            const [domain, path = ''] = t.domain.split('/');
+            px.add(new ProxyEntry({
+                domain,
+                path,
+                target: t.target,
+                redirectToHttps: t.redirect,
+                redirectToUrl: t.redirectUrl,
+                cors: t.cors,
+                headers: t.headers,
+                authorization: t.authorization,
+                preserveHost: t.preserveHost,
+            }));
+            logInfo(`  ${t.domain} => ${t.target || t.redirectUrl}`);
+        }
+        catch (error) {
+            logError(`Error adding proxy for ${t.domain}: ${error}`);
         }
-        px.start();
     }
     async getRunningContainers() {
         const ps = await exec('docker', ['ps', '-aq']);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/px",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "description": "Reverse Proxy",
   "main": "./dist/index.js",
   "type": "module",
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@cloud-cli/proxy": "^1.2.0",
+    "@cloud-cli/proxy": "^1.2.10",
     "@cloud-cli/exec": "^1.2.0"
   },
   "peerDependencies": {