@hivedev/hivesdk 1.0.42 → 1.0.44

package/hive-client.js

@@ -352,4 +352,4 @@ export {
   getDeviceId,
   initClient,
   login
-};  
+};

package/hive-server.cjs

@@ -191,6 +191,7 @@ var require_dist = __commonJS({
 // Server/server.js
 var server_exports = {};
 __export(server_exports, {
+  DatabaseConnector: () => DatabaseConnector_default,
   decryptFileWithPassword: () => decryptFileWithPassword,
   encryptAndStoreFile: () => encryptAndStoreFile,
   extractConfigurationForService: () => extractConfigurationForService,
@@ -530,14 +531,14 @@ async function saveConfiguration(configurationObject) {
     await encryptAndStoreFile(
       JSON.stringify(configurationObject.firebaseAdminCredentials),
       import_path4.default.join(getAppDataDirectory(), "firebase_admin_credentials.dat"),
-      process.env.WORD
+      process.env.SERVER_PASSWORD
     );
   }
   if (configurationObject.databaseCredentials) {
     await encryptAndStoreFile(
       JSON.stringify(configurationObject.databaseCredentials),
       import_path4.default.join(getAppDataDirectory(), "database_credentials.dat"),
-      process.env.WORD
+      process.env.SERVER_PASSWORD
     );
   }
   if (configurationObject.permissions) {
@@ -657,6 +658,7 @@ async function initServer({ serviceName, servicePort, remoteUrl, serverPassword
       throw new Error("Server password is not provided. Please set the SERVER_PASSWORD environment variable.");
     }
   }
+  process.env.SERVER_PASSWORD = serverPassword;
   HiveServerGlobals_default.initialize({ serviceName, servicePort, remoteUrl });
   bInitialized = true;
 }
@@ -682,32 +684,65 @@ async function parseRequestQuery(request) {
 }
 
 // Server/RequestHandlers/GetServiceUrls.js
+var serviceUpdateTimestamps = {};
 async function getServiceUrls(request, response) {
   await parseRequestQuery(request);
-  const serviceName = request.query.serviceName;
-  const localOnly = request.query.localOnly === "true";
-  const remoteOnly = request.query.remoteOnly === "true";
-  if (!serviceName) {
+  const requestedServiceName = request.query.serviceName;
+  const isLocalOnly = request.query.localOnly === "true";
+  const isRemoteOnly = request.query.remoteOnly === "true";
+  if (!requestedServiceName) {
     response.statusCode = 404;
     response.end();
     return;
   }
-  const serviceUrls = HiveServerGlobals_default.getServiceUrls(serviceName);
-  if (serviceUrls) {
-    if (localOnly) {
-      response.setHeader("Content-Type", "application/json");
-      response.end(JSON.stringify(serviceUrls[serviceName]["local"]));
-    } else if (remoteOnly) {
-      response.setHeader("Content-Type", "application/json");
-      response.end(JSON.stringify(serviceUrls[serviceName]["remote"]));
+  const FIVE_MINUTES_IN_MILLISECONDS = 5 * 60 * 1e3;
+  const cachedAddresses = HiveServerGlobals_default.getServiceUrls(requestedServiceName);
+  const lastUpdateAttempt = serviceUpdateTimestamps[requestedServiceName] || 0;
+  if (cachedAddresses && Date.now() - lastUpdateAttempt < FIVE_MINUTES_IN_MILLISECONDS) {
+    sendFormattedResponse(response, cachedAddresses, isLocalOnly, isRemoteOnly);
+    return;
+  }
+  try {
+    const hivePortalLanIp = process.env.HIVE_PORTAL_LAN_IP || "127.0.0.1";
+    const registryRequestUrl = `http://${hivePortalLanIp}:49152/ServiceUrls`;
+    const registryResponse = await fetch(
+      registryRequestUrl,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ serviceName: requestedServiceName })
+      }
+    );
+    if (registryResponse.ok) {
+      const serviceDiscoveryResult = await registryResponse.json();
+      const extractedServiceUrls = serviceDiscoveryResult.urls;
+      if (extractedServiceUrls) {
+        HiveServerGlobals_default.setServiceUrls(requestedServiceName, extractedServiceUrls);
+        serviceUpdateTimestamps[requestedServiceName] = Date.now();
+        sendFormattedResponse(response, extractedServiceUrls, isLocalOnly, isRemoteOnly);
+      } else {
+        response.statusCode = 404;
+        response.end(JSON.stringify({ message: "Service found but no URLs provided." }));
+      }
     } else {
-      response.setHeader("Content-Type", "application/json");
-      response.end(JSON.stringify(serviceUrls[serviceName]));
+      response.statusCode = registryResponse.status;
+      response.end();
     }
-    return;
+  } catch (networkError) {
+    console.error(`Error fetching service URLs for ${requestedServiceName}:`, networkError.message);
+    response.statusCode = 500;
+    response.end();
+  }
+}
+function sendFormattedResponse(response, serviceAddresses, isLocalOnly, isRemoteOnly) {
+  response.setHeader("Content-Type", "application/json");
+  let finalResult = serviceAddresses;
+  if (isLocalOnly) {
+    finalResult = serviceAddresses.local;
+  } else if (isRemoteOnly) {
+    finalResult = serviceAddresses.remote;
   }
-  response.statusCode = 404;
-  response.end();
+  response.end(JSON.stringify(finalResult));
 }
 
 // Common/Enumerations/ClientConnectionTypeFlags.js
@@ -1225,6 +1260,7 @@ async function registerService() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DatabaseConnector,
   decryptFileWithPassword,
   encryptAndStoreFile,
   extractConfigurationForService,

package/hive-server.js

@@ -630,6 +630,7 @@ async function initServer({ serviceName, servicePort, remoteUrl, serverPassword
       throw new Error("Server password is not provided. Please set the SERVER_PASSWORD environment variable.");
     }
   }
+  process.env.SERVER_PASSWORD = serverPassword;
   HiveServerGlobals_default.initialize({ serviceName, servicePort, remoteUrl });
   bInitialized = true;
 }
@@ -655,32 +656,65 @@ async function parseRequestQuery(request) {
 }
 
 // Server/RequestHandlers/GetServiceUrls.js
+var serviceUpdateTimestamps = {};
 async function getServiceUrls(request, response) {
   await parseRequestQuery(request);
-  const serviceName = request.query.serviceName;
-  const localOnly = request.query.localOnly === "true";
-  const remoteOnly = request.query.remoteOnly === "true";
-  if (!serviceName) {
+  const requestedServiceName = request.query.serviceName;
+  const isLocalOnly = request.query.localOnly === "true";
+  const isRemoteOnly = request.query.remoteOnly === "true";
+  if (!requestedServiceName) {
     response.statusCode = 404;
     response.end();
     return;
   }
-  const serviceUrls = HiveServerGlobals_default.getServiceUrls(serviceName);
-  if (serviceUrls) {
-    if (localOnly) {
-      response.setHeader("Content-Type", "application/json");
-      response.end(JSON.stringify(serviceUrls[serviceName]["local"]));
-    } else if (remoteOnly) {
-      response.setHeader("Content-Type", "application/json");
-      response.end(JSON.stringify(serviceUrls[serviceName]["remote"]));
+  const FIVE_MINUTES_IN_MILLISECONDS = 5 * 60 * 1e3;
+  const cachedAddresses = HiveServerGlobals_default.getServiceUrls(requestedServiceName);
+  const lastUpdateAttempt = serviceUpdateTimestamps[requestedServiceName] || 0;
+  if (cachedAddresses && Date.now() - lastUpdateAttempt < FIVE_MINUTES_IN_MILLISECONDS) {
+    sendFormattedResponse(response, cachedAddresses, isLocalOnly, isRemoteOnly);
+    return;
+  }
+  try {
+    const hivePortalLanIp = process.env.HIVE_PORTAL_LAN_IP || "127.0.0.1";
+    const registryRequestUrl = `http://${hivePortalLanIp}:49152/ServiceUrls`;
+    const registryResponse = await fetch(
+      registryRequestUrl,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ serviceName: requestedServiceName })
+      }
+    );
+    if (registryResponse.ok) {
+      const serviceDiscoveryResult = await registryResponse.json();
+      const extractedServiceUrls = serviceDiscoveryResult.urls;
+      if (extractedServiceUrls) {
+        HiveServerGlobals_default.setServiceUrls(requestedServiceName, extractedServiceUrls);
+        serviceUpdateTimestamps[requestedServiceName] = Date.now();
+        sendFormattedResponse(response, extractedServiceUrls, isLocalOnly, isRemoteOnly);
+      } else {
+        response.statusCode = 404;
+        response.end(JSON.stringify({ message: "Service found but no URLs provided." }));
+      }
     } else {
-      response.setHeader("Content-Type", "application/json");
-      response.end(JSON.stringify(serviceUrls[serviceName]));
+      response.statusCode = registryResponse.status;
+      response.end();
     }
-    return;
+  } catch (networkError) {
+    console.error(`Error fetching service URLs for ${requestedServiceName}:`, networkError.message);
+    response.statusCode = 500;
+    response.end();
+  }
+}
+function sendFormattedResponse(response, serviceAddresses, isLocalOnly, isRemoteOnly) {
+  response.setHeader("Content-Type", "application/json");
+  let finalResult = serviceAddresses;
+  if (isLocalOnly) {
+    finalResult = serviceAddresses.local;
+  } else if (isRemoteOnly) {
+    finalResult = serviceAddresses.remote;
   }
-  response.statusCode = 404;
-  response.end();
+  response.end(JSON.stringify(finalResult));
 }
 
 // Common/Enumerations/ClientConnectionTypeFlags.js
@@ -1197,6 +1231,7 @@ async function registerService() {
   }, 2e3);
 }
 export {
+  DatabaseConnector_default as DatabaseConnector,
   decryptFileWithPassword,
   encryptAndStoreFile,
   extractConfigurationForService,

package/package.json

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