@cloud-cli/px 4.4.1 → 4.4.3

package/dist/proxy-manager.d.ts

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

package/dist/proxy-manager.js

@@ -32,7 +32,7 @@ const readDomain = (options) => {
     options.domain = options.domain || options.host || options._[0];
 };
 const numberRe = /^[0-9]+$/;
-const readOption = value => {
+const readOption = (value) => {
     switch (true) {
         case value === 'true':
             return true;
@@ -105,11 +105,8 @@ export class ProxyManager {
     async getProxyListWithContainers() {
         const staticRoutes = getAll();
         const containers = (await this.getRunningContainers()).map(readProxyFromContainer);
-        const containerDomains = containers.map(c => c.domain.split('/')[0]);
-        const list = [
-            ...staticRoutes.filter(t => !containerDomains.includes(t.domain)),
-            ...containers,
-        ];
+        const containerDomains = containers.map((c) => c.domain.split('/')[0]);
+        const list = [...staticRoutes.filter((t) => !containerDomains.includes(t.domain)), ...containers];
         return list;
     }
     async getProxyList(filters = {}) {
@@ -128,11 +125,24 @@ export class ProxyManager {
         const all = await this.getProxyListWithContainers();
         return all.filter((p) => p.domain.includes(options.domain));
     }
-    async reload() {
+    async reload(options = {}) {
         const all = await this.getProxyListWithContainers();
-        px.reset();
+        if (options.servers) {
+            px.reset();
+        }
+        else {
+            px.resetProxies();
+        }
         for (const t of all) {
-            const [domain, path = ""] = t.domain.split("/");
+            this.loadProxy(t);
+        }
+        if (options.servers) {
+            px.start();
+        }
+    }
+    loadProxy(t) {
+        try {
+            const [domain, path = ''] = t.domain.split('/');
             px.add(new ProxyEntry({
                 domain,
                 path,
@@ -145,20 +155,20 @@ export class ProxyManager {
                 preserveHost: t.preserveHost,
             }));
         }
-        px.start();
+        catch (error) {
+            console.log(`Error adding proxy for ${t.domain}:`, error);
+        }
     }
     async getRunningContainers() {
-        const ps = await exec("docker", ["ps", "-aq"]);
-        const ids = ps.stdout.trim().split("\n");
-        const state = await exec("docker", ["inspect", ...ids]);
+        const ps = await exec('docker', ['ps', '-aq']);
+        const ids = ps.stdout.trim().split('\n');
+        const state = await exec('docker', ['inspect', ...ids]);
         const json = JSON.parse(state.stdout);
-        return json
-            .map(readDockerContainer)
-            .filter(d => d.ports.length && d.labels.host);
+        return json.map(readDockerContainer).filter((d) => d.ports.length && d.labels.host);
     }
 }
 function readProxyFromContainer(c) {
-    const domain = [c.labels.host, c.labels.path].filter(Boolean).join("/");
+    const domain = [c.labels.host, c.labels.path].filter(Boolean).join('/');
     const proxyOverrides = get(domain) || {};
     return {
         ...emptyProxy,
@@ -169,8 +179,8 @@ function readProxyFromContainer(c) {
 }
 function readDockerContainer(d) {
     const labels = Object.fromEntries(Object.entries(d.Config.Labels || {})
-        .filter(([key]) => key.startsWith("px:"))
-        .map(([key, value]) => [key.replace("px:", ""), value]));
+        .filter(([key]) => key.startsWith('px:'))
+        .map(([key, value]) => [key.replace('px:', ''), value]));
     return {
         id: d.Id,
         image: d.Image,
@@ -178,7 +188,7 @@ function readDockerContainer(d) {
         name: d.Name,
         labels: labels,
         ports: Object.entries(d.HostConfig.PortBindings || {}).map(([port, pb]) => ({
-            container: Number(port.replace(/\D+/, "")),
+            container: Number(port.replace(/\D+/, '')),
             host: Number(pb[0].HostPort),
         })),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/px",
-  "version": "4.4.1",
+  "version": "4.4.3",
   "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": {