@cloud-cli/px 4.2.5 → 4.2.7

package/dist/proxy-manager.d.ts

@@ -6,6 +6,7 @@ export declare class ProxyManager {
     updateProxy(options: WithOptionalProps<Proxy>): Promise<Proxy>;
     removeProxy(options: WithOptionalProps<DomainAndTarget>): Promise<boolean>;
     getDomainList(): Promise<string[]>;
+    getProxyListWithContainers(): Promise<Proxy[]>;
     getProxyList(filters?: Partial<Proxy>): Promise<Proxy[]>;
     getProxyListForDomain(options: WithOptionalProps<DomainName>): Promise<Proxy[]>;
     reload(): Promise<void>;

package/dist/proxy-manager.js

@@ -100,10 +100,18 @@ export class ProxyManager {
         const proxies = await this.getProxyList();
         return proxies.map((proxy) => proxy.domain);
     }
-    async getProxyList(filters = {}) {
+    async getProxyListWithContainers() {
         const staticRoutes = getAll();
-        const containers = await this.getRunningContainers();
-        const list = [...staticRoutes, ...containers.map(readProxyFromContainer)];
+        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,
+        ];
+        return list;
+    }
+    async getProxyList(filters = {}) {
+        const list = await this.getProxyListWithContainers();
         const keys = Object.keys(filters);
         if (!keys.length) {
             return list;
@@ -119,9 +127,7 @@ export class ProxyManager {
         return all.filter((p) => p.domain === options.domain);
     }
     async reload() {
-        const targets = await getAll();
-        const containers = await this.getRunningContainers();
-        const all = [...targets, ...containers.map(readProxyFromContainer)];
+        const all = await this.getProxyListWithContainers();
         px.reset();
         for (const t of all) {
             const [domain, path = ""] = t.domain.split("/");
@@ -165,7 +171,7 @@ function readProxyFromContainer(c) {
     };
 }
 function readDockerContainer(d) {
-    const labels = Object.fromEntries(Object.entries(d.Config.Labels)
+    const labels = Object.fromEntries(Object.entries(d.Config.Labels || {})
         .filter(([key]) => key.startsWith("px:"))
         .map(([key, value]) => [key.replace("px:", ""), value]));
     return {
@@ -174,7 +180,7 @@ function readDockerContainer(d) {
         state: d.State.Status,
         name: d.Name,
         labels: labels,
-        ports: Object.entries(d.HostConfig.PortBindings).map(([port, pb]) => ({
+        ports: Object.entries(d.HostConfig.PortBindings || {}).map(([port, pb]) => ({
             container: Number(port.replace(/\D+/, "")),
             host: Number(pb[0].HostPort),
         })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/px",
-  "version": "4.2.5",
+  "version": "4.2.7",
   "description": "Reverse Proxy",
   "main": "./dist/index.js",
   "type": "module",