@cloud-cli/px 4.1.6 → 4.2.0

package/dist/proxy-manager.d.ts

@@ -1,5 +1,5 @@
 import { ProxyServer } from '@cloud-cli/proxy';
-import type { DomainAndTarget, DomainName, Proxy, WithOptionalProps } from './types.js';
+import type { DockerContainer, DomainAndTarget, DomainName, Proxy, WithOptionalProps } from './types.js';
 export declare class ProxyManager {
     server: ProxyServer;
     addProxy(properties: WithOptionalProps<Proxy>): Promise<Proxy>;
@@ -9,4 +9,5 @@ export declare class ProxyManager {
     getProxyList(filters?: Partial<Proxy>): Promise<Proxy[]>;
     getProxyListForDomain(options: WithOptionalProps<DomainName>): Proxy[];
     reload(): Promise<void>;
+    getRunningContainers(): Promise<DockerContainer[]>;
 }

package/dist/proxy-manager.js

@@ -1,5 +1,6 @@
 import { getStorage, getConfig } from '@cloud-cli/cli';
 import { ProxyEntry, ProxyServer, ProxySettings } from '@cloud-cli/proxy';
+import { exec } from '@cloud-cli/exec';
 const defaultOptions = {
     httpPort: 80,
     httpsPort: 443,
@@ -43,11 +44,11 @@ const readOption = value => {
 };
 function applyProperties(proxy, options) {
     const properties = ['target', 'cors', 'redirect', 'redirectUrl', 'headers', 'authorization', 'preserveHost'];
-    properties.forEach((p) => {
+    for (const p of properties) {
         if (p in options) {
             proxy[p] = readOption(options[p]);
         }
-    });
+    }
 }
 export class ProxyManager {
     constructor() {
@@ -118,8 +119,8 @@ export class ProxyManager {
     async reload() {
         const targets = await getAll();
         px.reset();
-        targets.forEach((t) => {
-            const [domain, path = ''] = t.domain.split('/');
+        for (const t of targets) {
+            const [domain, path = ""] = t.domain.split("/");
             px.add(new ProxyEntry({
                 domain: domain,
                 path: path,
@@ -129,8 +130,44 @@ export class ProxyManager {
                 cors: t.cors,
                 headers: t.headers,
                 authorization: t.authorization,
+                preserveHost: t.preserveHost,
+            }));
+        }
+        const dockerTargets = await this.getRunningContainers();
+        for (const t of dockerTargets) {
+            if (!t.ports.length || !t.labels.host)
+                continue;
+            px.add(new ProxyEntry({
+                domain: t.labels.host,
+                target: `http://localhost:${t.ports[0].host}`,
+                redirectToHttps: true,
+                cors: true,
             }));
-        });
+        }
         px.start();
     }
+    async getRunningContainers() {
+        const ps = await exec("docker", ["ps", "-aq"]);
+        const ids = ps.stdout.trim().split("\n");
+        const format = '--format="{{.Id}},{{.Name}},{{.State.Status}},{{.Image}}"';
+        const state = await exec("docker", ["inspect", format, ...ids]);
+        const json = JSON.parse(state.stdout);
+        return json.map(readDockerContainer);
+    }
+}
+function readDockerContainer(d) {
+    const labels = Object.fromEntries(Object.entries(d.Config.Labels)
+        .filter(([key]) => key.startsWith("px:"))
+        .map(([key, value]) => [key.replace("px:", ""), value]));
+    return {
+        id: d.Id,
+        image: d.Image,
+        state: d.State.Status,
+        name: d.Name,
+        labels: labels,
+        ports: Object.entries(d.HostConfig.PortBindings).map(([port, pb]) => ({
+            container: Number(port.replace(/\D+/, "")),
+            host: Number(pb[0].HostPort),
+        })),
+    };
 }

package/dist/types.d.ts

@@ -19,4 +19,15 @@ export interface Proxy {
     cors: boolean;
 }
 export type WithOptionalProps<T extends object> = T & OptionalProps;
+export interface DockerContainer {
+    id: string;
+    image: string;
+    name: string;
+    state: string;
+    ports: Array<{
+        host: number;
+        container: number;
+    }>;
+    labels: Record<string, string>;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/px",
-  "version": "4.1.6",
+  "version": "4.2.0",
   "description": "Reverse Proxy",
   "main": "./dist/index.js",
   "type": "module",
@@ -8,7 +8,7 @@
   "prettier": "@cloud-cli/prettier-config",
   "scripts": {
     "test": "echo true",
-    "build": "rm -rf ./dist/* && tsc"
+    "build": "rm -rf ./dist/* && npm update && tsc"
   },
   "keywords": [
     "cloudy"
@@ -28,7 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@cloud-cli/proxy": "^1.2.0"
+    "@cloud-cli/proxy": "^1.2.0",
+    "@cloud-cli/exec": "^1.2.0"
   },
   "peerDependencies": {
     "@cloud-cli/cli": "^2.0.0"