godprotocol 2.3.60 → 2.3.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "2.3.60",
+  "version": "2.3.62",
   "description": "A distributed computing environment for Web 4.0 — integrating AI, decentralisation, and virtual computation.",
   "main": "Index.js",
   "type": "module",

package/server/Routable/Route_table.js

@@ -61,7 +61,7 @@ class Route_table extends Headers {
 
   handle_before = async (payload) => {
     for (const callback of this.before_callbacks) {
-      const result = await callback(payload);
+      const result = await callback(payload, this.gp);
 
       if (result && result.ok === false) {
         return result;
@@ -71,9 +71,9 @@ class Route_table extends Headers {
     return { ok: true };
   };
 
-  handle_after = async (payload, response) => {
+  handle_after = async (payload) => {
     for (const callback of this.after_callbacks) {
-      await callback(payload, response);
+      await callback(payload, this.gp);
     }
 
     return { ok: true };
@@ -81,7 +81,7 @@ class Route_table extends Headers {
 
   handle_error_callback = async (payload) => {
     for (const callback of this.error_callbacks) {
-      await callback(payload);
+      await callback(payload, this.gp);
     }
 
     return { ok: true };

package/server/version_control.js

@@ -11,16 +11,44 @@ const getBody = (req) => {
 
     req.on("end", () => {
       try {
-        const parsed = data ? JSON.parse(data) : {};
-        resolve(parsed);
+        if (!data.trim()) {
+          return resolve({});
+        }
+
+        const contentType = req.headers["content-type"] || "";
+
+        // JSON
+        if (contentType.includes("application/json")) {
+          try {
+            return resolve(JSON.parse(data));
+          } catch {
+            return resolve(data);
+          }
+        }
+
+        // Form URL Encoded
+        if (contentType.includes("application/x-www-form-urlencoded")) {
+          return resolve(Object.fromEntries(new URLSearchParams(data)));
+        }
+
+        // Plain text
+        if (contentType.includes("text/plain")) {
+          return resolve(data);
+        }
+
+        // Unknown type:
+        // attempt JSON, otherwise return raw body
+        try {
+          return resolve(JSON.parse(data));
+        } catch {
+          return resolve(data);
+        }
       } catch (err) {
-        reject(new Error("Invalid JSON body"));
+        reject(err);
       }
     });
 
-    req.on("error", (err) => {
-      reject(err);
-    });
+    req.on("error", reject);
   });
 };
 
@@ -224,6 +252,20 @@ const respond = (result, res) => {
 const version_middleware = async (req, res, routers) => {
   let error_stage = "Version Middleware";
 
+  // Hoisted so the catch block can see them — try/catch are separate
+  // block scopes, so anything declared with let/const *inside* try
+  // is invisible inside catch. These need to exist before try starts.
+  let version;
+  let versionRouter;
+  let query = {};
+  let body = {};
+  let name;
+  let router;
+  let securityResult;
+  let callback;
+  let payload;
+  let result;
+
   try {
     applyCors(req, res);
 
@@ -235,8 +277,7 @@ const version_middleware = async (req, res, routers) => {
     const parsed_url = new URL(req.url, `http://${req.headers.host}`);
     const pathname = parsed_url.pathname;
 
-    // ⬇️ query params captured for every method now
-    const query = Object.fromEntries(parsed_url.searchParams.entries());
+    query = Object.fromEntries(parsed_url.searchParams.entries()); // was: const query =
     req.query = query;
 
     req.request_id = crypto.randomUUID();
@@ -245,8 +286,6 @@ const version_middleware = async (req, res, routers) => {
     res.request_id = req.request_id;
 
     // STATIC ROUTE DETECTION
-    let version;
-
     const versionMatch = pathname.match(/^\/api\/([^\/]+)(\/|$)/i);
     if (req.method === "GET") {
       if (routers.static_path && pathname.startsWith(routers.static_path)) {
@@ -267,7 +306,7 @@ const version_middleware = async (req, res, routers) => {
         req.headers["x-platform"],
       );
 
-    let versionRouter = await routers.get_version(version);
+    versionRouter = await routers.get_version(version);
 
     if (!versionRouter) {
       version = "*";
@@ -288,10 +327,7 @@ const version_middleware = async (req, res, routers) => {
 
     version = versionRouter.version;
 
-    let body = {};
-
     if (req.method === "GET") {
-      // GET keeps existing behavior: query params double as body
       body = query;
     } else {
       const contentType = req.headers["content-type"] || "";
@@ -309,7 +345,7 @@ const version_middleware = async (req, res, routers) => {
       return versionRouter.routes(req, res);
     }
 
-    const router = routers;
+    router = routers;
 
     // remove query string from route
     let routePath = pathname;
@@ -324,13 +360,13 @@ const version_middleware = async (req, res, routers) => {
 
     req.url = routePath;
 
-    let name = routePath.replace(/^\//, "");
+    name = routePath.replace(/^\//, ""); // was: let name =
 
     const isWebhook = req.headers["is-webhook"];
 
     // SECURITY
     error_stage = "Header";
-    const securityResult = await router.handle_security(name, req, version);
+    securityResult = await router.handle_security(name, req, version); // was: const securityResult =
 
     if (securityResult !== true) {
       return respond(securityResult, res);
@@ -344,22 +380,19 @@ const version_middleware = async (req, res, routers) => {
     });
 
     // WEBHOOK PRIOR
-    const callback = await router.handle_before(
-      {
-        req,
-        body,
-        query,
-        route: name,
-        db: db.db,
-      },
-      router.gp,
-    );
+    callback = await router.handle_before({
+      req,
+      body,
+      query,
+      route: name,
+      db: db.db,
+    });
 
     if (callback?.response) return respond(callback.response, res);
 
     if (callback?.body) body = callback.body;
 
-    if (callback?.query) query = callback.query; // only if you make `query` a `let` — see note below
+    if (callback?.query) query = callback.query;
 
     if (callback?.headers) req.headers = callback.headers;
 
@@ -369,7 +402,7 @@ const version_middleware = async (req, res, routers) => {
     // EXECUTE
 
     error_stage = "Handler";
-    let payload = {
+    payload = {
       body,
       query,
       route: name,
@@ -383,23 +416,20 @@ const version_middleware = async (req, res, routers) => {
       params: {},
       memory: router.gp.memory,
     };
-    const result = await router.execute(name, payload, version);
+    result = await router.execute(name, payload, version);
 
     // WEBHOOK AFTER
     if (!isWebhook && version !== "*") {
       error_stage = "Webhook";
 
-      await router.handle_after(
-        {
-          req: payload,
-          result,
-          headers: req.headers,
-          version,
-          route: payload.route_pattern || name,
-          db: db.db,
-        },
-        router.gp,
-      );
+      await router.handle_after({
+        req: payload,
+        result,
+        headers: req.headers,
+        version,
+        route: payload.route_pattern || name,
+        db: db.db,
+      });
     }
 
     return respond(result, res);
@@ -407,11 +437,9 @@ const version_middleware = async (req, res, routers) => {
     console.error(`${error_stage} Error:`, err);
 
     try {
-      await router.handle_error_callback({
+      await routers?.handle_error_callback?.({
         request_id: req?.request_id,
-
         stage: error_stage,
-
         timestamp: new Date().toISOString(),
 
         error: {