Merge branch 'main' of https://github.com/fosrl/pangolin

server/routers/badger/badger.ts

@@ -1,6 +1,4 @@
 import { Router } from "express";
-import { getConfig } from "./getConfig";
-import { receiveBandwidth } from "./receiveBandwidth";
 
 const badger = Router();
 
@@ -8,7 +6,4 @@ badger.get("/", (_, res) => {
     res.status(200).json({ message: "Healthy" });
 });
 
-badger.get("/getConfig", getConfig);
-badger.post("/receiveBandwidth", receiveBandwidth);
-
 export default badger;

server/routers/external.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import badger from "./badger/badger";
+import gerbil from "./gerbil/gerbil";
 import pangolin from "./pangolin/pangolin";
 
 const unauth = Router();
@@ -8,7 +8,7 @@ unauth.get("/", (_, res) => {
     res.status(200).json({ message: "Healthy" });
 });
 
-unauth.use("/newt", badger);
+unauth.use("/newt", gerbil);
 unauth.use("/pangolin", pangolin);
 
 export default unauth;

server/routers/gerbil/gerbil.ts

@@ -1,4 +1,6 @@
 import { Router } from "express";
+import { getConfig } from "./getConfig";
+import { receiveBandwidth } from "./receiveBandwidth";
 
 const gerbil = Router();
 
@@ -6,4 +8,7 @@ gerbil.get("/", (_, res) => {
     res.status(200).json({ message: "Healthy" });
 });
 
+gerbil.get("/getConfig", getConfig);
+gerbil.post("/receiveBandwidth", receiveBandwidth);
+
 export default gerbil;

server/routers/gerbil/receiveBandwidth.ts

@@ -45,7 +45,7 @@ export const receiveBandwidth = async (req: Request, res: Response, next: NextFu
 
     res.status(200).json({ message: 'Bandwidth data updated successfully' });
   } catch (error) {
-    console.error('Error updating bandwidth data:', error);
+    logger.error('Error updating bandwidth data:', error);
     res.status(500).json({ error: 'Internal server error' });
   }
 };

server/routers/global/createSite.ts

@@ -0,0 +1,43 @@
+import { Request, Response, NextFunction } from 'express';
+import { DrizzleError, eq } from 'drizzle-orm';
+import { sites, resources, targets, exitNodes } from '@server/db/schema';
+import db from '@server/db';
+import logger from '@server/logger';
+
+interface CreateSiteRequest {
+    publicKey: string;
+    name: string;
+    orgId: number;
+}
+
+export const createSite = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
+  try {
+    const createSiteRequest: CreateSiteRequest = req.body;
+
+    // pick a subdomain not used
+    // pick a subnet not used
+    // pick an exit node
+
+    // const site = db
+    // .insert(sites)
+    // .values({
+    //     orgId: createSiteRequest.orgId,
+    //     exitNode: exitNodeId,
+    //     name: createSiteRequest.name,
+    //     subdomain: subdomain,
+    //     pubKey: createSiteRequest.publicKey,
+    //     subnet: subnet,
+    // })
+    // .returning()
+    // .get();
+
+    const site = {
+        
+    }
+
+    res.status(200).json(site);
+  } catch (error) {
+    logger.error('Error creating site:', error);
+    res.status(500).json({ error: 'Internal server error' });
+  }
+};

server/routers/global/global.ts

@@ -0,0 +1,12 @@
+import { Router } from "express";
+import { createSite } from "./createSite";
+
+const global = Router();
+
+global.get("/", (_, res) => {
+    res.status(200).json({ message: "Healthy" });
+});
+
+global.get("/createSite", createSite);
+
+export default global;

server/routers/internal.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
-import badger from "./badger/badger";
 import gerbil from "./gerbil/gerbil";
+import badger from "./badger/badger";
 import { traefikConfigProvider } from "@server/traefik-config-provider";
 
 const unauth = Router();