@cloud-cli/px 3.0.1 → 3.1.1

package/dist/index.d.ts

@@ -1,13 +1,19 @@
 import { init } from '@cloud-cli/cli';
 import { DomainAndTarget, Domain } from './proxy-manager.js';
 import { ProxyEntry } from './proxy.js';
+declare function add(options: ProxyEntry): Promise<unknown>;
+declare function remove(options: DomainAndTarget): Promise<unknown>;
+declare function list(): Promise<ProxyEntry[]>;
+declare function get(options: Domain): Promise<ProxyEntry[]>;
+declare function domains(): Promise<string[]>;
+declare function reload(): Promise<void>;
 declare const _default: {
-    add(options: ProxyEntry): Promise<unknown>;
-    remove(options: DomainAndTarget): Promise<unknown>;
-    list(): Promise<ProxyEntry[]>;
-    get(options: Domain): Promise<ProxyEntry[]>;
-    reload(): void;
-    domains(): Promise<string[]>;
-    [init](): Promise<void>;
+    add: typeof add;
+    remove: typeof remove;
+    list: typeof list;
+    get: typeof get;
+    domains: typeof domains;
+    reload: typeof reload;
+    [init]: typeof reload;
 };
 export default _default;

package/dist/index.js

@@ -4,32 +4,28 @@ import { ProxyManager } from './proxy-manager.js';
 import { ProxyEntry, ProxyServer } from './proxy.js';
 const px = new ProxyServer();
 const manager = new ProxyManager();
-export default {
-    async add(options) {
-        const proxy = await manager.addProxy(options);
-        px.reload();
-        return proxy;
-    },
-    async remove(options) {
-        const removed = await manager.removeProxy(options);
-        px.reload();
-        return removed;
-    },
-    list() {
-        return manager.getProxyList();
-    },
-    get(options) {
-        return manager.getProxyListForDomain(options);
-    },
-    reload() {
-        this[init]();
-    },
-    domains() {
-        return manager.getDomainList();
-    },
-    async [init]() {
-        Resource.use(new SQLiteDriver());
-        await Resource.create(ProxyEntry);
-        return px.start();
-    },
-};
+async function add(options) {
+    const proxy = await manager.addProxy(options);
+    px.reload();
+    return proxy;
+}
+async function remove(options) {
+    const removed = await manager.removeProxy(options);
+    px.reload();
+    return removed;
+}
+function list() {
+    return manager.getProxyList();
+}
+function get(options) {
+    return manager.getProxyListForDomain(options);
+}
+function domains() {
+    return manager.getDomainList();
+}
+async function reload() {
+    Resource.use(new SQLiteDriver());
+    await Resource.create(ProxyEntry);
+    return px.start();
+}
+export default { add, remove, list, get, domains, reload, [init]: reload };

package/dist/proxy-manager.js

@@ -35,12 +35,18 @@ export class ProxyManager {
             if (!options.target) {
                 return reject(targetNotSpecifiedError);
             }
-            const proxy = await Resource.find(ProxyEntry, new Query().where('domain').is(options.domain).where('target').is(options.target));
+            const query = new Query().where('domain').is(options.domain);
+            if (options.target) {
+                query.where('target').is(options.target);
+            }
+            const proxy = await Resource.find(ProxyEntry, query);
             if (!proxy.length) {
                 return reject(notFoundError);
             }
             try {
-                await proxy[0].remove();
+                for (const p of proxy) {
+                    await p.remove();
+                }
                 resolve(true);
             }
             catch (error) {

package/dist/proxy.d.ts

@@ -20,7 +20,7 @@ export declare class ProxyServer {
     reload(): void;
     protected loadCertificates(): Promise<void>;
     protected loadTargets(): Promise<void>;
-    protected serveRequest(req: IncomingMessage, res: ServerResponse): void;
+    protected serveRequest(req: IncomingMessage, res: ServerResponse, insecure?: boolean): void;
     protected getSslOptions(): {
         SNICallback(domain: string, cb: Function): any;
     };

package/dist/proxy.js

@@ -45,7 +45,7 @@ export class ProxyServer {
         this.reload();
         this.servers.forEach((server) => server.close());
         this.servers = [
-            createHttpServer((req, res) => this.serveRequest(req, res)).listen(80),
+            createHttpServer((req, res) => this.serveRequest(req, res, true)).listen(80),
             createHttpsServer(this.getSslOptions(), (req, res) => this.serveRequest(req, res)).listen(443),
         ];
     }
@@ -73,7 +73,7 @@ export class ProxyServer {
         this.targets = {};
         targets.forEach((entry) => (this.targets[entry.domain] = entry));
     }
-    serveRequest(req, res) {
+    serveRequest(req, res, insecure = false) {
         const origin = getOrigin(req);
         const proxyEntry = this.targets[origin?.hostname];
         if (!origin.hostname || !proxyEntry) {
@@ -81,6 +81,13 @@ export class ProxyServer {
             res.end();
             return;
         }
+        if (proxyEntry.redirect && insecure) {
+            const newURL = new URL(req.url, `https://${req.headers.host}`);
+            res.setHeader('Location', String(newURL));
+            res.writeHead(301, 'HTTPS is better');
+            res.end();
+            return;
+        }
         const target = proxyEntry.target;
         const url = new URL(req.url, target);
         const isCorsPreflight = req.method === 'OPTIONS' && proxyEntry.cors;

package/package.json

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