@omen.foundation/node-microservice-runtime 0.1.114 → 0.1.116

package/package.json

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

package/scripts/publish-service.mjs

@@ -753,7 +753,7 @@ async function discoverStorageObjects(srcDir, cwd = process.cwd()) {
     // Resolve src path relative to current working directory (where publish is run from)
     const srcPath = path.isAbsolute(srcDir) ? srcDir : path.resolve(cwd, srcDir || 'src');
     
-    console.log(`[beamo-node] Searching for @StorageObject decorators in: ${srcPath}`);
+    // Suppressed: console.log(`[beamo-node] Searching for @StorageObject decorators in: ${srcPath}`);
     
     // Check if directory exists
     try {
@@ -774,7 +774,7 @@ async function discoverStorageObjects(srcDir, cwd = process.cwd()) {
       return storageObjects;
     }
     
-    console.log(`[beamo-node] Scanning ${files.length} TypeScript file(s) for @StorageObject decorators...`);
+    // Suppressed: console.log(`[beamo-node] Scanning ${files.length} TypeScript file(s) for @StorageObject decorators...`);
     
     for (const file of files) {
       const content = await fs.readFile(file, 'utf-8');
@@ -792,15 +792,15 @@ async function discoverStorageObjects(srcDir, cwd = process.cwd()) {
             archived: false, // Match C# CLI default (DeploymentService.cs line 1618)
             checksum: null, // Not sent to backend, just for internal tracking
           });
-          console.log(`[beamo-node] ✓ Discovered storage object: ${storageName} (from ${path.relative(cwd, file)})`);
+          // Suppressed: console.log(`[beamo-node] ✓ Discovered storage object: ${storageName} (from ${path.relative(cwd, file)})`);
         }
       }
     }
     
-    if (storageObjects.length === 0) {
-      console.log(`[beamo-node] No @StorageObject decorators found in ${files.length} file(s) in ${srcPath}`);
-      console.log(`[beamo-node] Make sure your storage classes are decorated with @StorageObject('StorageName')`);
-    }
+    // Suppressed: if (storageObjects.length === 0) {
+    //   console.log(`[beamo-node] No @StorageObject decorators found in ${files.length} file(s) in ${srcPath}`);
+    //   console.log(`[beamo-node] Make sure your storage classes are decorated with @StorageObject('StorageName')`);
+    // }
   } catch (error) {
     console.warn(`[beamo-node] Error discovering storage objects: ${error instanceof Error ? error.message : String(error)}`);
     if (error instanceof Error && error.stack) {
@@ -975,7 +975,7 @@ async function updateManifest({
         archived: s.archived !== undefined ? s.archived : false, // Always include archived, default to false like C# CLI
       };
       storageMap.set(s.id, newStorage);
-      console.log(`[beamo-node] Adding new storage to manifest: ${s.id} (type: ${newStorage.storageType}, enabled: ${newStorage.enabled})`);
+      // Suppressed: console.log(`[beamo-node] Adding new storage to manifest: ${s.id} (type: ${newStorage.storageType}, enabled: ${newStorage.enabled})`);
     } else {
       // Update existing storage to ensure storageType is 'mongov1' and format is correct
       // Match C# CLI behavior: always set templateId="small" and archived=false (DeploymentService.cs lines 1618, 1620)
@@ -988,7 +988,7 @@ async function updateManifest({
         archived: existing.archived !== undefined ? existing.archived : false, // Always include archived, default to false like C# CLI
       };
       storageMap.set(s.id, updatedStorage);
-      console.log(`[beamo-node] Updating existing storage in manifest: ${s.id} (type: mongov1, enabled: ${updatedStorage.enabled})`);
+      // Suppressed: console.log(`[beamo-node] Updating existing storage in manifest: ${s.id} (type: mongov1, enabled: ${updatedStorage.enabled})`);
     }
   });
   // Convert to array and remove any extra fields (like checksum) that backend doesn't expect
@@ -1001,13 +1001,13 @@ async function updateManifest({
     archived: s.archived !== undefined ? s.archived : false, // Always include archived, default to false like C# CLI
   }));
   
-  // Log storage references being sent to backend for debugging
-  if (storageReferences.length > 0) {
-    console.log(`[beamo-node] Publishing ${storageReferences.length} storage reference(s) to backend:`);
-    storageReferences.forEach(sr => {
-      console.log(`[beamo-node]   - ${sr.id}: type=${sr.storageType}, enabled=${sr.enabled}, templateId=${sr.templateId || 'small'}`);
-    });
-  }
+  // Suppressed: Log storage references being sent to backend for debugging
+  // if (storageReferences.length > 0) {
+  //   console.log(`[beamo-node] Publishing ${storageReferences.length} storage reference(s) to backend:`);
+  //   storageReferences.forEach(sr => {
+  //     console.log(`[beamo-node]   - ${sr.id}: type=${sr.storageType}, enabled=${sr.enabled}, templateId=${sr.templateId || 'small'}`);
+  //   });
+  // }
 
   // Extract existing components and dependencies for the service
   const existingServiceRef = serviceReferences.find(
@@ -1021,18 +1021,22 @@ async function updateManifest({
     ?? [];
 
   // Components are ServiceComponent objects with {name: string}
-  // Merge discovered with existing (preserve existing, add new)
+  // For federated components (IFederatedInventory/* and IFederatedLogin/*), replace all existing with newly discovered
+  // For other components, merge discovered with existing (preserve existing, add new)
   const componentsMap = new Map();
-  // Add existing components
+  // Add existing components, but filter out federated ones (they will be replaced)
   if (Array.isArray(existingComponents)) {
     existingComponents.forEach(comp => {
       const name = comp.name?.Value ?? comp.name ?? comp;
       if (typeof name === 'string') {
-        componentsMap.set(name, { name });
+        // Skip federated components - they will be replaced by discovered ones
+        if (!name.startsWith('IFederatedInventory/') && !name.startsWith('IFederatedLogin/')) {
+          componentsMap.set(name, { name });
+        }
       }
     });
   }
-  // Add discovered components (will overwrite existing if same name)
+  // Add discovered components (will overwrite existing if same name, and replace all federated components)
   (discoveredComponents || []).forEach(compName => {
     componentsMap.set(compName, { name: compName });
   });
@@ -1124,7 +1128,7 @@ async function updateManifest({
     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}`);
+    // Suppressed: 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}`);
   }
@@ -1156,7 +1160,10 @@ async function updateManifest({
   }
   
   const responseBody = await response.json();
-  console.log(`\n${colors.green}✓${colors.reset} Manifest published successfully`);
+  
+  // Collect success messages to return and display after progress bar
+  const successMessages = [];
+  successMessages.push(`${colors.green}✓${colors.reset} Manifest published successfully`);
   
   // Always try to get and display the storage connection string if storage references exist
   if (storageReferences.length > 0) {
@@ -1173,8 +1180,8 @@ async function updateManifest({
       
       if (storageConnectionResponse.ok) {
         const connectionString = await storageConnectionResponse.text();
-        console.log(`${colors.green}✓${colors.reset} MongoDB Connection String:`);
-        console.log(`${colors.cyan}${connectionString}${colors.reset}`);
+        successMessages.push(`${colors.green}✓${colors.reset} MongoDB Connection String:`);
+        successMessages.push(`${colors.cyan}${connectionString}${colors.reset}`);
       } else {
         const errorText = await storageConnectionResponse.text();
         let errorMessage = errorText;
@@ -1184,17 +1191,19 @@ async function updateManifest({
         } catch {
           // Not JSON, use as-is
         }
-        console.log(`${colors.red}✗${colors.reset} Could not retrieve connection string: ${errorMessage}`);
+        successMessages.push(`${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.`);
+          successMessages.push(`${colors.yellow}⚠${colors.reset} This may prevent "Explore Data" from working. storageGroupId may not be set in the manifest.`);
         }
       }
     } catch (err) {
-      console.log(`${colors.yellow}⚠${colors.reset} Could not retrieve connection string: ${err.message}`);
+      successMessages.push(`${colors.yellow}⚠${colors.reset} Could not retrieve connection string: ${err.message}`);
     }
   }
+  
+  return successMessages;
 }
 
 async function prepareDockerContext({ entry, distDir, openapiPath, packageJson, packageLock, nodeVersion }) {
@@ -1578,15 +1587,15 @@ async function main() {
       storageType: 'mongov1', // MongoDB storage type (matches ServiceStorageReference in backend)
     }));
     
-    if (discoveredStorage.length > 0) {
-      console.log(`[beamo-node] Discovered ${discoveredStorage.length} storage object(s): ${discoveredStorage.map(s => s.id).join(', ')}`);
-    }
+    // Suppressed: if (discoveredStorage.length > 0) {
+    //   console.log(`[beamo-node] Discovered ${discoveredStorage.length} storage object(s): ${discoveredStorage.map(s => s.id).join(', ')}`);
+    // }
     
     progress.complete('Storage and components discovered');
 
     // Step 8: Publish manifest
     progress.start('Publishing manifest');
-    await updateManifest({
+    const successMessages = await updateManifest({
       apiHost,
       token,
       cid,
@@ -1601,6 +1610,12 @@ async function main() {
       packageJson: packageJsonPath,
     });
     progress.complete('Manifest published');
+    
+    // Display success messages after progress bar completes
+    if (successMessages && successMessages.length > 0) {
+      console.log(''); // New line after progress bar
+      successMessages.forEach(msg => console.log(msg));
+    }
 
     // Success message
     console.log(`\n${colors.green}${colors.bright}✓ Publish complete!${colors.reset}`);