adding overwrite * wildcard

Luna-devv · Sep 1, 2022 · 0582508 · 0582508
1 parent 098fe68
commit 0582508
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/hosts.ts b/src/hosts.ts
@@ -32,6 +32,17 @@ export default {
         type: "WEB",
         arc: true
     },
+    "c.lunish.nl": {
+        target: 'https://lunish.nl/luna',
+        type: "REDIRECT",
+        overwrites: [
+            {
+                path: '/*',
+                type: "REDIRECT",
+                target: 'https://cdn.waya.one/{path}'
+            }
+        ]
+    },
 
     "waya.one": {
         target: 5000,
@@ -52,9 +63,9 @@ export default {
         ip: '127.0.9.1',
         overwrites: [
             {
-                path: ['/sex', '/sex2'],
+                path: '/*',
                 type: "REDIRECT",
-                target: 'https://google.com'
+                target: 'https://google.com/{path}'
             }
         ]
     }

diff --git a/src/server.ts b/src/server.ts
@@ -36,7 +36,7 @@ export async function requestManager(req, res) {
     // managing overwrites
     if (overwrites) {
         for (const overwrite of overwrites) {
-            if (typeof overwrite.path == 'string' ? req.url == overwrite.path : overwrite.path.includes(req.url)) {
+            if ((typeof overwrite.path == 'string' ? req.url == overwrite.path : overwrite.path.includes(req.url)) || overwrite.path === '/*') {
 
                 // Proxy overwrite
                 switch (overwrite.type) {
@@ -49,8 +49,9 @@ export async function requestManager(req, res) {
 
                     case "REDIRECT":
                         // Redirections
+                        if (typeof overwrite.target === 'number') return onError('Redirect target cannot be number', req, res);
                         res.writeHead(302, {
-                            'Location': overwrite.target
+                            'Location': overwrite.target.replace(/{path}/g, req.url.slice(1))
                         });
                         res.end();
                         break;
@@ -88,6 +89,7 @@ export async function requestManager(req, res) {
 
         case "REDIRECT":
             // Redirections
+            if (typeof target === 'number') return onError('Redirect target cannot be number', req, res);
             res.writeHead(302, {
                 'Location': target
             });