@hivedev/hivesdk 1.0.25 → 1.0.27

package/hive-server.cjs

@@ -34,7 +34,7 @@ var require_dist = __commonJS({
   "node_modules/cookie/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.parse = parse3;
+    exports2.parse = parse2;
     exports2.serialize = serialize2;
     var cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/;
     var cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/;
@@ -47,7 +47,7 @@ var require_dist = __commonJS({
       C.prototype = /* @__PURE__ */ Object.create(null);
       return C;
     })();
-    function parse3(str, options) {
+    function parse2(str, options) {
       const obj = new NullObject();
       const len = str.length;
       if (len < 2)
@@ -564,10 +564,29 @@ async function initServer({ serviceName, servicePort, remoteUrl }) {
   bInitialized = true;
 }
 
+// Server/Utility/ParseRequestQuery.js
+async function parseRequestQuery(request) {
+  if (typeof request.query === "object") {
+    return request.query;
+  }
+  const url = request.url;
+  const queryString = url.split("?")[1];
+  if (!queryString) {
+    request.query = {};
+    return request.query;
+  }
+  const params = new URLSearchParams(queryString);
+  const query = {};
+  for (const [key, value] of params.entries()) {
+    query[key] = value;
+  }
+  request.query = query;
+  return query;
+}
+
 // Server/RequestHandlers/GetServiceUrls.js
 async function getServiceUrls(request, response) {
-  const parsedUrl = parse(request.url, true);
-  const query = parsedUrl.query;
+  await parseRequestQuery(request);
   const serviceName = request.query.serviceName;
   const localOnly = request.query.localOnly === "true";
   const remoteOnly = request.query.remoteOnly === "true";
@@ -642,8 +661,27 @@ async function getHiveUrl(path6) {
   return "http://127.0.0.1:49152/" + path6;
 }
 
+// Server/Utility/ParseRequestBody.js
+async function parseRequestBody(request) {
+  if (typeof request.body == "object") {
+    return request.body;
+  }
+  for await (const chunk of request) {
+    body += chunk;
+  }
+  let parsedBody = null;
+  try {
+    parsedBody = JSON.parse(body);
+  } catch (e) {
+    return null;
+  }
+  request.body = parsedBody;
+  return parsedBody;
+}
+
 // Server/RequestHandlers/HandleLogin.js
 async function handleLogin(request, response) {
+  await parseRequestBody(request);
   const userId = request.body.userId;
   const password = request.body.password;
   const deviceId = request.headers["x-device-id"];
@@ -680,44 +718,6 @@ async function handleLogin(request, response) {
   }
 }
 
-// Server/Utility/ParseRequestBody.js
-async function parseRequestBody(request) {
-  if (typeof request.body == "object") {
-    return request.body;
-  }
-  for await (const chunk of request) {
-    body += chunk;
-  }
-  let parsedBody = null;
-  try {
-    parsedBody = JSON.parse(body);
-  } catch (e) {
-    return null;
-  }
-  request.body = parsedBody;
-  return parsedBody;
-}
-
-// Server/Utility/ParseRequestQuery.js
-async function parseRequestQuery(request) {
-  if (typeof request.query === "object") {
-    return request.query;
-  }
-  const url = request.url;
-  const queryString = url.split("?")[1];
-  if (!queryString) {
-    request.query = {};
-    return request.query;
-  }
-  const params = new URLSearchParams(queryString);
-  const query = {};
-  for (const [key, value] of params.entries()) {
-    query[key] = value;
-  }
-  request.query = query;
-  return query;
-}
-
 // Server/HandleHiveRequests.js
 var import_path5 = __toESM(require("path"), 1);
 var import_fs6 = __toESM(require("fs"), 1);
@@ -748,6 +748,7 @@ async function parseRequestCookies(request) {
 // Server/Authentication/IsLoggedIn.js
 var import_cookie = __toESM(require_dist(), 1);
 async function isLoggedIn(request, response, bSendResponse = false) {
+  await parseRequestCookies(request);
   const cookies = request.cookies;
   const deviceId = request.headers["x-device-id"];
   const headers = request.headers;
@@ -810,6 +811,8 @@ async function isLoggedIn(request, response, bSendResponse = false) {
 
 // Server/RequestHandlers/HandleLogout.js
 async function handleLogout(request, response) {
+  await parseRequestCookies(request);
+  await parseRequestBody(request);
   const sessionToken = request.cookies.sessionToken || request.headers["x-session-token"];
   const logoutResponse = await fetch(
     await getHiveUrl("/Logout"),
@@ -833,6 +836,8 @@ async function handleLogout(request, response) {
 
 // Server/Authentication/IsLoggedInWithPermission.js
 async function isLoggedInWithPermission(request, response, bSendResponse = false) {
+  await parseRequestCookies(request);
+  await parseRequestBody(request);
   const cookies = request.cookies;
   const deviceId = request.headers["x-device-id"] || "";
   const headers = request.headers;
@@ -903,25 +908,18 @@ async function handleHiveRequests(request, response, next) {
   const { url, method } = request;
   try {
     if (url === "/Login" && method === "POST") {
-      await parseRequestBody(request);
       await handleLogin(request, response);
       return;
     } else if (url === "/Logout" && method === "POST") {
-      await parseRequestCookies(request);
-      await parseRequestBody(request);
       await handleLogout(request, response);
       return;
     } else if (url === "/ServiceUrls" && method === "GET") {
-      await parseRequestQuery(request);
       await getServiceUrls(request, response);
       return;
     } else if (url === "/IsLoggedIn" && method === "POST") {
-      await parseRequestCookies(request);
       await isLoggedIn(request, response, true);
       return;
     } else if (url === "/IsLoggedInWithPermission" && method === "POST") {
-      await parseRequestCookies(request);
-      await parseRequestBody(request);
       await isLoggedInWithPermission(request, response, true);
       return;
     } else if (url === "/hive-client.js") {

package/hive-server.js

@@ -29,7 +29,7 @@ var require_dist = __commonJS({
   "node_modules/cookie/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.parse = parse3;
+    exports.parse = parse2;
     exports.serialize = serialize2;
     var cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/;
     var cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/;
@@ -42,7 +42,7 @@ var require_dist = __commonJS({
       C.prototype = /* @__PURE__ */ Object.create(null);
       return C;
     })();
-    function parse3(str, options) {
+    function parse2(str, options) {
       const obj = new NullObject();
       const len = str.length;
       if (len < 2)
@@ -540,10 +540,29 @@ async function initServer({ serviceName, servicePort, remoteUrl }) {
   bInitialized = true;
 }
 
+// Server/Utility/ParseRequestQuery.js
+async function parseRequestQuery(request) {
+  if (typeof request.query === "object") {
+    return request.query;
+  }
+  const url = request.url;
+  const queryString = url.split("?")[1];
+  if (!queryString) {
+    request.query = {};
+    return request.query;
+  }
+  const params = new URLSearchParams(queryString);
+  const query = {};
+  for (const [key, value] of params.entries()) {
+    query[key] = value;
+  }
+  request.query = query;
+  return query;
+}
+
 // Server/RequestHandlers/GetServiceUrls.js
 async function getServiceUrls(request, response) {
-  const parsedUrl = parse(request.url, true);
-  const query = parsedUrl.query;
+  await parseRequestQuery(request);
   const serviceName = request.query.serviceName;
   const localOnly = request.query.localOnly === "true";
   const remoteOnly = request.query.remoteOnly === "true";
@@ -618,8 +637,27 @@ async function getHiveUrl(path6) {
   return "http://127.0.0.1:49152/" + path6;
 }
 
+// Server/Utility/ParseRequestBody.js
+async function parseRequestBody(request) {
+  if (typeof request.body == "object") {
+    return request.body;
+  }
+  for await (const chunk of request) {
+    body += chunk;
+  }
+  let parsedBody = null;
+  try {
+    parsedBody = JSON.parse(body);
+  } catch (e) {
+    return null;
+  }
+  request.body = parsedBody;
+  return parsedBody;
+}
+
 // Server/RequestHandlers/HandleLogin.js
 async function handleLogin(request, response) {
+  await parseRequestBody(request);
   const userId = request.body.userId;
   const password = request.body.password;
   const deviceId = request.headers["x-device-id"];
@@ -656,46 +694,8 @@ async function handleLogin(request, response) {
   }
 }
 
-// Server/Utility/ParseRequestBody.js
-async function parseRequestBody(request) {
-  if (typeof request.body == "object") {
-    return request.body;
-  }
-  for await (const chunk of request) {
-    body += chunk;
-  }
-  let parsedBody = null;
-  try {
-    parsedBody = JSON.parse(body);
-  } catch (e) {
-    return null;
-  }
-  request.body = parsedBody;
-  return parsedBody;
-}
-
-// Server/Utility/ParseRequestQuery.js
-async function parseRequestQuery(request) {
-  if (typeof request.query === "object") {
-    return request.query;
-  }
-  const url = request.url;
-  const queryString = url.split("?")[1];
-  if (!queryString) {
-    request.query = {};
-    return request.query;
-  }
-  const params = new URLSearchParams(queryString);
-  const query = {};
-  for (const [key, value] of params.entries()) {
-    query[key] = value;
-  }
-  request.query = query;
-  return query;
-}
-
 // Server/HandleHiveRequests.js
-import path5, { parse as parse2 } from "path";
+import path5, { parse } from "path";
 import fs6 from "fs";
 
 // Server/Utility/ParseRequestCookies.js
@@ -724,6 +724,7 @@ async function parseRequestCookies(request) {
 // Server/Authentication/IsLoggedIn.js
 var import_cookie = __toESM(require_dist(), 1);
 async function isLoggedIn(request, response, bSendResponse = false) {
+  await parseRequestCookies(request);
   const cookies = request.cookies;
   const deviceId = request.headers["x-device-id"];
   const headers = request.headers;
@@ -786,6 +787,8 @@ async function isLoggedIn(request, response, bSendResponse = false) {
 
 // Server/RequestHandlers/HandleLogout.js
 async function handleLogout(request, response) {
+  await parseRequestCookies(request);
+  await parseRequestBody(request);
   const sessionToken = request.cookies.sessionToken || request.headers["x-session-token"];
   const logoutResponse = await fetch(
     await getHiveUrl("/Logout"),
@@ -809,6 +812,8 @@ async function handleLogout(request, response) {
 
 // Server/Authentication/IsLoggedInWithPermission.js
 async function isLoggedInWithPermission(request, response, bSendResponse = false) {
+  await parseRequestCookies(request);
+  await parseRequestBody(request);
   const cookies = request.cookies;
   const deviceId = request.headers["x-device-id"] || "";
   const headers = request.headers;
@@ -879,25 +884,18 @@ async function handleHiveRequests(request, response, next) {
   const { url, method } = request;
   try {
     if (url === "/Login" && method === "POST") {
-      await parseRequestBody(request);
       await handleLogin(request, response);
       return;
     } else if (url === "/Logout" && method === "POST") {
-      await parseRequestCookies(request);
-      await parseRequestBody(request);
       await handleLogout(request, response);
       return;
     } else if (url === "/ServiceUrls" && method === "GET") {
-      await parseRequestQuery(request);
       await getServiceUrls(request, response);
       return;
     } else if (url === "/IsLoggedIn" && method === "POST") {
-      await parseRequestCookies(request);
       await isLoggedIn(request, response, true);
       return;
     } else if (url === "/IsLoggedInWithPermission" && method === "POST") {
-      await parseRequestCookies(request);
-      await parseRequestBody(request);
       await isLoggedInWithPermission(request, response, true);
       return;
     } else if (url === "/hive-client.js") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hivedev/hivesdk",
   "type": "module",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "scripts": {