@omen.foundation/node-microservice-runtime 0.1.87 → 0.1.89

package/package.json

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

package/scripts/publish-service.mjs

@@ -296,17 +296,25 @@ async function verifyManifestExists(baseUrl, tag, headers) {
 
 async function prepareUploadLocation(baseUrl, headers) {
   const url = new URL('blobs/uploads/', baseUrl);
-  // Debug logging only - removed verbose output
   // Match C# CLI exactly: StringContent("") sets Content-Type and Content-Length
+  const requestHeaders = {
+    ...headers,
+    'Content-Type': 'text/plain; charset=utf-8',
+    'Content-Length': '0',
+  };
+  
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]     [SUBSTEP: Prepare Upload Location]`);
+    console.error(`[beamo-node]       URL: ${url}`);
+    console.error(`[beamo-node]       Method: POST`);
+    console.error(`[beamo-node]       Headers:`, JSON.stringify(requestHeaders, null, 2));
+  }
+  
   let response;
   try {
     response = await fetch(url, {
       method: 'POST',
-      headers: {
-        ...headers,
-        'Content-Type': 'text/plain; charset=utf-8',
-        'Content-Length': '0',
-      },
+      headers: requestHeaders,
       body: '', // Empty body
     });
   } catch (error) {
@@ -319,15 +327,20 @@ async function prepareUploadLocation(baseUrl, headers) {
       ...(error instanceof Error && error.cause ? { cause: error.cause } : {}),
     };
     if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
-      console.error('[beamo-node] Network error preparing upload location:', errorDetails);
+      console.error('[beamo-node]       Network error:', errorDetails);
     }
     throw new Error(`Network error preparing upload location: ${errorMsg}. URL: ${url.toString()}`);
   }
   
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]       Response Status: ${response.status}`);
+    console.error(`[beamo-node]       Response Headers:`, JSON.stringify(Object.fromEntries(response.headers.entries()), null, 2));
+  }
+  
   if (!response.ok) {
     const text = await response.text();
     if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
-      console.error('[beamo-node] Upload location failed', {
+      console.error('[beamo-node]       Upload location failed', {
         status: response.status,
         statusText: response.statusText,
         headers: Object.fromEntries(response.headers.entries()),
@@ -336,11 +349,25 @@ async function prepareUploadLocation(baseUrl, headers) {
     }
     throw new Error(`Failed to prepare upload location: ${response.status} ${text}`);
   }
-  return response.headers.get('location');
+  const location = response.headers.get('location');
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]       Upload Location: ${location}`);
+  }
+  return location;
 }
 
 async function uploadBlob(baseUrl, digest, buffer, headers) {
-  if (await checkBlobExists(baseUrl, digest, headers)) {
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]       [SUBSTEP: Upload Blob]`);
+    console.error(`[beamo-node]         Digest: ${digest}`);
+    console.error(`[beamo-node]         Size: ${buffer.length} bytes`);
+  }
+  
+  const exists = await checkBlobExists(baseUrl, digest, headers);
+  if (exists) {
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node]         Blob already exists, skipping upload`);
+    }
     return { digest, size: buffer.length };
   }
 
@@ -357,17 +384,36 @@ async function uploadBlob(baseUrl, digest, buffer, headers) {
   locationUrl.searchParams.set('digest', digest);
   const uploadUrl = locationUrl;
 
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]         Upload URL: ${uploadUrl}`);
+    console.error(`[beamo-node]         Method: PUT`);
+    const uploadHeaders = { ...headers, 'Content-Type': 'application/octet-stream' };
+    console.error(`[beamo-node]         Upload Headers:`, JSON.stringify(uploadHeaders, null, 2));
+  }
+
   const response = await fetch(uploadUrl, {
     method: 'PUT',
     headers: { ...headers, 'Content-Type': 'application/octet-stream' },
     body: buffer,
   });
 
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]         Response Status: ${response.status}`);
+    console.error(`[beamo-node]         Response Headers:`, JSON.stringify(Object.fromEntries(response.headers.entries()), null, 2));
+  }
+
   if (!response.ok) {
     const text = await response.text();
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node]         Response Body: ${text.substring(0, 500)}`);
+    }
     throw new Error(`Failed to upload blob ${digest}: ${response.status} ${text}`);
   }
 
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]         Blob upload successful`);
+  }
+
   return { digest, size: buffer.length };
 }
 
@@ -376,19 +422,39 @@ async function uploadManifest(baseUrl, manifestJson, shortImageId, headers) {
   // The backend looks up images using this short imageId tag
   const manifestJsonString = JSON.stringify(manifestJson);
   const url = new URL(`manifests/${shortImageId}`, baseUrl);
-  
-  // Debug logging only
-  // Debug logging only - removed verbose output
+  const requestHeaders = { ...headers, 'Content-Type': MANIFEST_MEDIA_TYPE };
+
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]     [SUBSTEP: Upload Manifest to Registry]`);
+    console.error(`[beamo-node]       URL: ${url}`);
+    console.error(`[beamo-node]       Method: PUT`);
+    console.error(`[beamo-node]       Tag: ${shortImageId}`);
+    console.error(`[beamo-node]       Headers:`, JSON.stringify(requestHeaders, null, 2));
+    console.error(`[beamo-node]       Manifest JSON:`, manifestJsonString);
+  }
 
   const response = await fetch(url, {
     method: 'PUT',
-    headers: { ...headers, 'Content-Type': MANIFEST_MEDIA_TYPE },
+    headers: requestHeaders,
     body: manifestJsonString,
   });
+  
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]       Response Status: ${response.status}`);
+    console.error(`[beamo-node]       Response Headers:`, JSON.stringify(Object.fromEntries(response.headers.entries()), null, 2));
+  }
+  
   if (!response.ok) {
     const text = await response.text();
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node]       Response Body: ${text.substring(0, 500)}`);
+    }
     throw new Error(`Failed to upload manifest: ${response.status} ${text}`);
   }
+  
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]       Manifest upload successful`);
+  }
 }
 
 async function fetchJson(url, options = {}) {
@@ -477,13 +543,26 @@ async function getScopedAccessToken(apiHost, cid, pid, refreshToken, fallbackTok
 
 async function getRegistryUrl(apiHost, token, cid, pid) {
   const scope = pid ? `${cid}.${pid}` : cid;
-  const body = await fetchJson(new URL('/basic/beamo/registry', apiHost), {
-    headers: {
-      Authorization: `Bearer ${token}`,
-      Accept: 'application/json',
-      ...(scope ? { 'X-BEAM-SCOPE': scope } : {}),
-    },
-  });
+  const url = new URL('/basic/beamo/registry', apiHost);
+  const headers = {
+    Authorization: `Bearer ${token}`,
+    Accept: 'application/json',
+    ...(scope ? { 'X-BEAM-SCOPE': scope } : {}),
+  };
+  
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node] [STEP: Get Registry URL]`);
+    console.error(`[beamo-node]   URL: ${url}`);
+    console.error(`[beamo-node]   Headers:`, JSON.stringify(headers, null, 2));
+    console.error(`[beamo-node]   Scope: ${scope}`);
+  }
+  
+  const body = await fetchJson(url, { headers });
+  
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   Response:`, JSON.stringify(body, null, 2));
+  }
+  
   const uri = body.uri || body.registry || body.url;
   if (!uri) {
     throw new Error('Registry URI response missing "uri" field.');
@@ -492,7 +571,13 @@ async function getRegistryUrl(apiHost, token, cid, pid) {
   const normalized = uri.includes('://') ? uri : `https://${uri}`;
   const parsed = new URL(normalized);
   // parsedUri.Host in C# is just the hostname (no port), so we use hostname here
-  return `${parsed.protocol}//${parsed.hostname}/v2/`;
+  const registryUrl = `${parsed.protocol}//${parsed.hostname}/v2/`;
+  
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   Normalized Registry URL: ${registryUrl}`);
+  }
+  
+  return registryUrl;
 }
 
 async function uploadDockerImage({
@@ -516,9 +601,18 @@ async function uploadDockerImage({
     'x-ks-projectid': pid, // Use realm PID (matches backend's rc.projectId in DockerRegistryClient)
     'x-ks-token': token, // Access token from login
   };
+  
   if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
-    console.error(`[beamo-node] Uploading to: ${baseUrl}`);
-    console.error(`[beamo-node] Upload headers PID: ${pid} (realm), gamePid: ${gamePid}`);
+    console.error(`[beamo-node] [STEP: Upload Docker Image]`);
+    console.error(`[beamo-node]   Base URL: ${baseUrl}`);
+    console.error(`[beamo-node]   Registry URL: ${registryUrl}`);
+    console.error(`[beamo-node]   Unique Name: ${uniqueName}`);
+    console.error(`[beamo-node]   Service ID: ${serviceId}`);
+    console.error(`[beamo-node]   CID: ${cid}`);
+    console.error(`[beamo-node]   Realm PID: ${pid}`);
+    console.error(`[beamo-node]   Game PID: ${gamePid}`);
+    console.error(`[beamo-node]   Full Image ID: ${fullImageId}`);
+    console.error(`[beamo-node]   Upload Headers:`, JSON.stringify(headers, null, 2));
   }
 
   const { manifestEntry, configBuffer, layers } = await readDockerImageTar(imageTarPath);
@@ -527,16 +621,38 @@ async function uploadDockerImage({
   if (progress) {
     process.stdout.write(`\r${colors.blue}↑${colors.reset} Uploading config...`);
   }
-  const configDigest = await uploadBlob(baseUrl, sha256Digest(configBuffer), configBuffer, headers);
+  const configDigestValue = sha256Digest(configBuffer);
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   [SUBSTEP: Upload Config]`);
+    console.error(`[beamo-node]     Config Digest: ${configDigestValue}`);
+    console.error(`[beamo-node]     Config Size: ${configBuffer.length} bytes`);
+  }
+  const configDigest = await uploadBlob(baseUrl, configDigestValue, configBuffer, headers);
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]     Config Upload Result:`, JSON.stringify(configDigest, null, 2));
+  }
 
   // Upload layers with progress
   const layerDescriptors = [];
   const totalLayers = layers.length;
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   [SUBSTEP: Upload Layers]`);
+    console.error(`[beamo-node]     Total Layers: ${totalLayers}`);
+  }
   for (let i = 0; i < layers.length; i++) {
     if (progress) {
       process.stdout.write(`\r${colors.blue}↑${colors.reset} Uploading layers (${i + 1}/${totalLayers})...`);
     }
-    const descriptor = await uploadBlob(baseUrl, sha256Digest(layers[i].buffer), layers[i].buffer, headers);
+    const layerDigestValue = sha256Digest(layers[i].buffer);
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node]     Layer ${i + 1}/${totalLayers}:`);
+      console.error(`[beamo-node]       Digest: ${layerDigestValue}`);
+      console.error(`[beamo-node]       Size: ${layers[i].buffer.length} bytes`);
+    }
+    const descriptor = await uploadBlob(baseUrl, layerDigestValue, layers[i].buffer, headers);
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node]       Upload Result:`, JSON.stringify(descriptor, null, 2));
+    }
     layerDescriptors.push({
       digest: descriptor.digest,
       size: descriptor.size,
@@ -560,7 +676,15 @@ async function uploadDockerImage({
     process.stdout.write(`\r${colors.blue}↑${colors.reset} Uploading manifest...`);
   }
   const shortImageId = shortDigest(fullImageId);
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   [SUBSTEP: Upload Manifest]`);
+    console.error(`[beamo-node]     Short Image ID: ${shortImageId}`);
+    console.error(`[beamo-node]     Manifest JSON:`, JSON.stringify(uploadManifestJson, null, 2));
+  }
   await uploadManifest(baseUrl, uploadManifestJson, shortImageId, headers);
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]     Manifest Upload Complete`);
+  }
   if (progress) {
     process.stdout.write('\r');
   }
@@ -852,32 +976,52 @@ async function updateManifest({
     storageReferences,
   };
 
+  const publishUrl = new URL('/api/beamo/manifests', apiHost);
+  const publishHeaders = {
+    Authorization: `Bearer ${token}`,
+    Accept: 'application/json',
+    'Content-Type': 'application/json',
+    'X-BEAM-SCOPE': `${cid}.${pid}`,
+  };
+
   if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
-    console.error(`[beamo-node] Publishing manifest with imageId: ${shortImageId}`);
-    console.error(`[beamo-node] Service: ${serviceId}, CID: ${cid}, PID: ${pid}`);
-    console.error(`[beamo-node] Manifest service entry:`, JSON.stringify(mappedServices.find(s => s.serviceName === serviceId), null, 2));
+    console.error(`[beamo-node] [STEP: Publish Manifest to Backend]`);
+    console.error(`[beamo-node]   URL: ${publishUrl}`);
+    console.error(`[beamo-node]   Method: POST`);
+    console.error(`[beamo-node]   Headers:`, JSON.stringify(publishHeaders, null, 2));
+    console.error(`[beamo-node]   Service: ${serviceId}`);
+    console.error(`[beamo-node]   CID: ${cid}`);
+    console.error(`[beamo-node]   PID: ${pid}`);
+    console.error(`[beamo-node]   Short Image ID: ${shortImageId}`);
+    console.error(`[beamo-node]   Request Body:`, JSON.stringify(requestBody, null, 2));
+    console.error(`[beamo-node]   Service Entry in Manifest:`, JSON.stringify(mappedServices.find(s => s.serviceName === serviceId), null, 2));
   }
 
-  const response = await fetch(new URL('/api/beamo/manifests', apiHost), {
+  const response = await fetch(publishUrl, {
     method: 'POST',
-    headers: {
-      Authorization: `Bearer ${token}`,
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-      'X-BEAM-SCOPE': `${cid}.${pid}`,
-    },
+    headers: publishHeaders,
     body: JSON.stringify(requestBody),
   });
 
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   Response Status: ${response.status}`);
+    console.error(`[beamo-node]   Response Headers:`, JSON.stringify(Object.fromEntries(response.headers.entries()), null, 2));
+  }
+
   if (!response.ok) {
     const text = await response.text();
     if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
-      console.error(`[beamo-node] Manifest publish failed: ${response.status}`);
-      console.error(`[beamo-node] Response: ${text}`);
-      console.error(`[beamo-node] Request body:`, JSON.stringify(requestBody, null, 2));
+      console.error(`[beamo-node]   Response Body: ${text}`);
+      console.error(`[beamo-node]   Full Request Body (for debugging):`, JSON.stringify(requestBody, null, 2));
     }
     throw new Error(`Failed to publish manifest: ${response.status} ${text}`);
   }
+  
+  const responseBody = await response.json();
+  if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+    console.error(`[beamo-node]   Response Body:`, JSON.stringify(responseBody, null, 2));
+    console.error(`[beamo-node]   ✓ Manifest published successfully`);
+  }
 }
 
 async function prepareDockerContext({ entry, distDir, openapiPath, packageJson, packageLock, nodeVersion }) {
@@ -1108,12 +1252,20 @@ async function main() {
     
     // Use resolvedGamePid for registry URL and uniqueName - backend checks using game PID scope
     // The pid variable might be a realm PID, but the backend expects game PID for registry operations
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node] [STEP: Calculate Registry Path]`);
+      console.error(`[beamo-node]   CID: ${cid}`);
+      console.error(`[beamo-node]   Realm PID: ${pid}`);
+      console.error(`[beamo-node]   Resolved Game PID: ${resolvedGamePid}`);
+      console.error(`[beamo-node]   Service ID: ${serviceId}`);
+    }
     const registryUrl = await getRegistryUrl(apiHost, token, cid, resolvedGamePid);
-    const uniqueName = md5Hex(`${cid}_${resolvedGamePid}_${serviceId}`).substring(0, 30);
+    const uniqueNameInput = `${cid}_${resolvedGamePid}_${serviceId}`;
+    const uniqueName = md5Hex(uniqueNameInput).substring(0, 30);
     if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
-      console.error(`[beamo-node] Registry URL: ${registryUrl}`);
-      console.error(`[beamo-node] Unique name: ${uniqueName}`);
-      console.error(`[beamo-node] CID: ${cid}, PID: ${pid}, Game PID: ${resolvedGamePid}`);
+      console.error(`[beamo-node]   Unique Name Input: ${uniqueNameInput}`);
+      console.error(`[beamo-node]   Unique Name (MD5 first 30 chars): ${uniqueName}`);
+      console.error(`[beamo-node]   Registry URL: ${registryUrl}`);
     }
     progress.complete('Authenticated');
 
@@ -1139,7 +1291,7 @@ async function main() {
     const baseUrl = `${registryUrl}${uniqueName}/`;
     const verifyHeaders = {
       'x-ks-clientid': cid,
-      'x-ks-projectid': resolvedGamePid || pid, // Use gamePid to match registry scope
+      'x-ks-projectid': pid, // Use realm PID (matches backend's rc.projectId when checking registry)
       'x-ks-token': token,
     };