@omen.foundation/node-microservice-runtime 0.1.110 → 0.1.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omen.foundation/node-microservice-runtime",
-  "version": "0.1.110",
+  "version": "0.1.112",
   "description": "Beamable microservice runtime for Node.js/TypeScript services.",
   "type": "module",
   "main": "dist/index.js",

package/scripts/publish-service.mjs

@@ -887,6 +887,36 @@ async function getAllTypeScriptFiles(dir) {
   return files;
 }
 
+// Read LOG_PROVIDER from beam.env (default: "Cloudwatch")
+async function getLogProvider(packageJsonPath) {
+  const defaultLogProvider = 'Cloudwatch';
+  try {
+    const beamEnvPath = path.join(path.dirname(packageJsonPath), 'beam.env');
+    const beamEnvHiddenPath = path.join(path.dirname(packageJsonPath), '.beam.env');
+    let beamEnvContent = null;
+    
+    if (await fs.access(beamEnvPath).then(() => true).catch(() => false)) {
+      beamEnvContent = await fs.readFile(beamEnvPath, 'utf8');
+    } else if (await fs.access(beamEnvHiddenPath).then(() => true).catch(() => false)) {
+      beamEnvContent = await fs.readFile(beamEnvHiddenPath, 'utf8');
+    }
+    
+    if (beamEnvContent) {
+      // Parse LOG_PROVIDER from beam.env
+      const logProviderMatch = beamEnvContent.match(/^LOG_PROVIDER\s*=\s*(.+)$/m);
+      if (logProviderMatch) {
+        const logProvider = logProviderMatch[1].trim().replace(/^["']|["']$/g, '');
+        if (logProvider && (logProvider === 'Cloudwatch' || logProvider === 'Clickhouse')) {
+          return logProvider;
+        }
+      }
+    }
+  } catch (err) {
+    // Ignore errors, use default
+  }
+  return defaultLogProvider;
+}
+
 async function updateManifest({
   apiHost,
   token,
@@ -899,6 +929,7 @@ async function updateManifest({
   discoveredStorage,
   discoveredComponents,
   discoveredDependencies,
+  packageJson,
 }) {
   const serviceReferences = existingManifest?.serviceReferences?.Value
     ?? existingManifest?.serviceReferences
@@ -1029,6 +1060,9 @@ async function updateManifest({
   });
   const dependencies = Array.from(dependenciesMap.values());
 
+  // Get LOG_PROVIDER from beam.env (default: "Cloudwatch")
+  const logProvider = await getLogProvider(packageJson);
+  
   let updated = false;
   const mappedServices = serviceReferences.map((reference) => {
     const name = reference.serviceName?.Value ?? reference.serviceName;
@@ -1041,7 +1075,7 @@ async function updateManifest({
         containerHealthCheckPort: reference.containerHealthCheckPort?.Value ?? reference.containerHealthCheckPort ?? 6565,
         imageId: shortImageId,
         imageCpuArch: reference.imageCpuArch?.Value ?? reference.imageCpuArch ?? 'linux/amd64',
-        logProvider: reference.logProvider?.Value ?? reference.logProvider ?? 'Clickhouse',
+        logProvider: reference.logProvider?.Value ?? reference.logProvider ?? logProvider,
         dependencies,
         components,
       };
@@ -1053,7 +1087,7 @@ async function updateManifest({
       containerHealthCheckPort: reference.containerHealthCheckPort?.Value ?? reference.containerHealthCheckPort ?? 6565,
       imageId: reference.imageId?.Value ?? reference.imageId ?? shortImageId,
       imageCpuArch: reference.imageCpuArch?.Value ?? reference.imageCpuArch ?? 'linux/amd64',
-      logProvider: reference.logProvider?.Value ?? reference.logProvider ?? 'Clickhouse',
+      logProvider: reference.logProvider?.Value ?? reference.logProvider ?? logProvider,
       dependencies: reference.dependencies?.Value ?? reference.dependencies ?? [],
       components: reference.components?.Value ?? reference.components ?? [],
     };
@@ -1067,31 +1101,12 @@ async function updateManifest({
       containerHealthCheckPort: 6565,
       imageId: shortImageId,
       imageCpuArch: 'linux/amd64',
-      logProvider: 'Clickhouse',
+      logProvider: logProvider,
       dependencies,
       components,
     });
   }
 
-  // Log storage references being sent to backend
-  if (storageReferences.length > 0) {
-    console.log(`[beamo-node] Publishing ${storageReferences.length} storage reference(s) in manifest:`);
-    storageReferences.forEach(s => {
-      const details = [
-        `id: ${s.id}`,
-        `storageType: ${s.storageType || 'mongov1'}`,
-        `enabled: ${s.enabled !== false}`,
-        ...(s.templateId ? [`templateId: ${s.templateId}`] : []),
-        ...(s.archived !== undefined ? [`archived: ${s.archived}`] : []),
-      ].join(', ');
-      console.log(`[beamo-node]   - ${details}`);
-    });
-    console.log(`[beamo-node] Storage references JSON: ${JSON.stringify(storageReferences, null, 2)}`);
-  } else {
-    console.warn(`[beamo-node] ⚠️  WARNING: No storage references in manifest. Database will NOT be created automatically.`);
-    console.warn(`[beamo-node] Make sure you have @StorageObject('StorageName') decorators in your code.`);
-  }
-
   // Build request body matching C# CLI format exactly
   // C# sends: { comments, manifest, storageReferences } where storageReferences comes from manifest.storageReference
   // C# assigns it directly, so if null/empty it serializes as null (not omitted)
@@ -1102,6 +1117,18 @@ async function updateManifest({
     storageReferences: storageReferences.length > 0 ? storageReferences : null,
   };
   
+  // Save manifest to publishHistory folder
+  try {
+    const publishHistoryDir = path.join(process.cwd(), 'publishHistory');
+    await fs.mkdir(publishHistoryDir, { recursive: true });
+    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+    const manifestFile = path.join(publishHistoryDir, `manifest_${timestamp}.json`);
+    await fs.writeFile(manifestFile, JSON.stringify(requestBody, null, 2), 'utf8');
+    console.log(`${colors.dim}Manifest saved to: ${manifestFile}${colors.reset}`);
+  } catch (err) {
+    console.log(`${colors.yellow}⚠${colors.reset} Could not save manifest to file: ${err.message}`);
+  }
+  
   const publishUrl = new URL('/basic/beamo/manifest', apiHost);
   const publishHeaders = {
     Authorization: `Bearer ${token}`,
@@ -1110,18 +1137,6 @@ async function updateManifest({
     'X-BEAM-SCOPE': `${cid}.${pid}`,
   };
 
-  // Always log the full manifest being sent for debugging
-  console.log(`\n=== MANIFEST BEING SENT TO BACKEND ===`);
-  console.log(`URL: ${publishUrl}`);
-  console.log(`Method: POST`);
-  console.log(`Headers:`, JSON.stringify(publishHeaders, null, 2));
-  console.log(`\nFull Request Body:`);
-  console.log(JSON.stringify(requestBody, null, 2));
-  console.log(`\nService Entry in Manifest:`);
-  const serviceEntry = mappedServices.find(s => s.serviceName === serviceId);
-  console.log(JSON.stringify(serviceEntry, null, 2));
-  console.log(`=== END MANIFEST ===\n`);
-
   const response = await fetch(publishUrl, {
     method: 'POST',
     headers: publishHeaders,
@@ -1142,41 +1157,43 @@ async function updateManifest({
   
   const responseBody = await response.json();
   console.log(`\n${colors.green}✓${colors.reset} Manifest published successfully`);
-  console.log(`${colors.dim}Backend Response:${colors.reset}`, JSON.stringify(responseBody, null, 2));
   
-  // After publishing, fetch the current manifest to see what was stored
-  // Note: ManifestView doesn't include storageGroupId, but we can at least verify storageReferences
-  try {
-    const currentManifestUrl = new URL('/basic/beamo/manifest/current', apiHost);
-    const currentManifestResponse = await fetch(currentManifestUrl, {
-      method: 'GET',
-      headers: {
-        Authorization: `Bearer ${token}`,
-        Accept: 'application/json',
-        'X-BEAM-SCOPE': `${cid}.${pid}`,
-      },
-    });
-    
-    if (currentManifestResponse.ok) {
-      const currentManifest = await currentManifestResponse.json();
-      console.log(`\n${colors.cyan}=== CURRENT MANIFEST (as stored in backend) ===${colors.reset}`);
-      console.log(JSON.stringify(currentManifest, null, 2));
-      console.log(`${colors.cyan}=== END CURRENT MANIFEST ===${colors.reset}\n`);
+  // Always try to get and display the storage connection string if storage references exist
+  if (storageReferences.length > 0) {
+    try {
+      const storageConnectionUrl = new URL('/basic/beamo/storage/connection', apiHost);
+      const storageConnectionResponse = await fetch(storageConnectionUrl, {
+        method: 'GET',
+        headers: {
+          Authorization: `Bearer ${token}`,
+          Accept: 'application/json',
+          'X-BEAM-SCOPE': `${cid}.${pid}`,
+        },
+      });
       
-      // Check if storage references are present
-      if (currentManifest?.manifest?.storageReference) {
-        console.log(`${colors.green}✓${colors.reset} Storage references found in stored manifest: ${currentManifest.manifest.storageReference.length} reference(s)`);
-        currentManifest.manifest.storageReference.forEach(sr => {
-          console.log(`  - ${sr.id}: type=${sr.storageType}, enabled=${sr.enabled}, templateId=${sr.templateId || 'N/A'}, archived=${sr.archived || false}`);
-        });
+      if (storageConnectionResponse.ok) {
+        const connectionString = await storageConnectionResponse.text();
+        console.log(`${colors.green}✓${colors.reset} MongoDB Connection String:`);
+        console.log(`${colors.cyan}${connectionString}${colors.reset}`);
       } else {
-        console.log(`${colors.yellow}⚠${colors.reset} No storage references found in stored manifest`);
+        const errorText = await storageConnectionResponse.text();
+        let errorMessage = errorText;
+        try {
+          const errorJson = JSON.parse(errorText);
+          errorMessage = errorJson.message || errorText;
+        } catch {
+          // Not JSON, use as-is
+        }
+        console.log(`${colors.red}✗${colors.reset} Could not retrieve connection string: ${errorMessage}`);
+        if (errorMessage.includes('Could not open connection to database') || 
+            errorMessage.includes('Credentials have not been generated') || 
+            errorMessage.includes('storageGroupId')) {
+          console.log(`${colors.yellow}⚠${colors.reset} This may prevent "Explore Data" from working. storageGroupId may not be set in the manifest.`);
+        }
       }
-    } else {
-      console.log(`${colors.yellow}⚠${colors.reset} Could not fetch current manifest: ${currentManifestResponse.status}`);
+    } catch (err) {
+      console.log(`${colors.yellow}⚠${colors.reset} Could not retrieve connection string: ${err.message}`);
     }
-  } catch (err) {
-    console.log(`${colors.yellow}⚠${colors.reset} Could not fetch current manifest: ${err.message}`);
   }
 }
 
@@ -1581,6 +1598,7 @@ async function main() {
       discoveredStorage,
       discoveredComponents,
       discoveredDependencies,
+      packageJson: packageJsonPath,
     });
     progress.complete('Manifest published');