@omen.foundation/node-microservice-runtime 0.1.83 → 0.1.85

package/package.json

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

package/scripts/generate-openapi.mjs

@@ -61,7 +61,8 @@ async function main() {
 
   if (args.envFile) {
     const envPath = path.resolve(args.envFile);
-    dotenv.config({ path: envPath });
+    // Use override: true to ensure .env file values override any existing environment variables
+    dotenv.config({ path: envPath, override: true });
   }
 
   if (args.cid) {

package/scripts/publish-service.mjs

@@ -151,7 +151,7 @@ function parseArgs(argv) {
     }
   }
 
-  if (!args.envFile && process.env.npm_config_env_file) {
+  if (process.env.npm_config_env_file) {
     args.envFile = process.env.npm_config_env_file;
   }
 
@@ -509,16 +509,16 @@ async function uploadDockerImage({
   progress,
 }) {
   const baseUrl = `${registryUrl}${uniqueName}/`;
-  // Match C# CLI exactly: use x-ks-* headers (all lowercase) with CID, PID (realm PID), and access token
-  // Note: Backend might check using gamePid, but C# CLI uses realm PID for upload headers
+  // Try using gamePid in headers - backend checks registry using game PID scope
+  // The uniqueName is calculated with gamePid, so headers should match
   const headers = {
     'x-ks-clientid': cid,
-    'x-ks-projectid': pid, // Use realm PID (not gamePid) - matches ctx.Pid in C# CLI
+    'x-ks-projectid': gamePid || pid, // Use gamePid if available, fallback to realm PID
     '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] Upload headers PID: ${gamePid || pid} (gamePid: ${gamePid}, realm: ${pid})`);
   }
 
   const { manifestEntry, configBuffer, layers } = await readDockerImageTar(imageTarPath);
@@ -981,11 +981,26 @@ ENTRYPOINT ["/beam/service/start.sh"]
 }
 
 async function main() {
-  const args = parseArgs(process.argv.slice(2));
-
-  if (args.envFile) {
-    dotenv.config({ path: path.resolve(args.envFile) });
+  // Parse --env-file first so we can load .env before parseArgs reads environment variables
+  // This ensures .env file values are used instead of stale system environment variables
+  const rawArgs = process.argv.slice(2);
+  let envFile = undefined;
+  for (let i = 0; i < rawArgs.length; i++) {
+    if (rawArgs[i] === '--env-file' && i + 1 < rawArgs.length) {
+      envFile = rawArgs[i + 1];
+      break;
+    }
   }
+  
+  // Load .env file first with override to ensure it takes precedence
+  if (envFile) {
+    dotenv.config({ path: path.resolve(envFile), override: true });
+  } else if (process.env.npm_config_env_file) {
+    dotenv.config({ path: path.resolve(process.env.npm_config_env_file), override: true });
+  }
+
+  // Now parse all args - env vars from .env will be available
+  const args = parseArgs(rawArgs);
 
   const pkg = await readJson(path.resolve('package.json'));
   const beamableConfig = pkg.beamable || {};
@@ -1119,6 +1134,32 @@ async function main() {
     });
     progress.complete('Image uploaded');
 
+    // Verify image exists in registry before proceeding
+    const shortImageId = shortDigest(fullImageId);
+    const baseUrl = `${registryUrl}${uniqueName}/`;
+    const verifyHeaders = {
+      'x-ks-clientid': cid,
+      'x-ks-projectid': resolvedGamePid || pid, // Use gamePid to match registry scope
+      'x-ks-token': token,
+    };
+    
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node] Verifying image exists: ${baseUrl}manifests/${shortImageId}`);
+      console.error(`[beamo-node] Verify headers:`, verifyHeaders);
+    }
+    
+    // Wait a moment for registry to propagate
+    await new Promise(resolve => setTimeout(resolve, 3000));
+    
+    const imageExists = await verifyManifestExists(baseUrl, shortImageId, verifyHeaders);
+    if (!imageExists) {
+      throw new Error(`Image verification failed: manifest with tag ${shortImageId} not found in registry at ${baseUrl}manifests/${shortImageId}. The image may not have uploaded successfully.`);
+    }
+    
+    if (process.env.BEAMO_DEBUG === '1' || process.env.BEAMO_NODE_DEBUG === '1') {
+      console.error(`[beamo-node] ✓ Image verification passed: ${baseUrl}manifests/${shortImageId}`);
+    }
+
     // Step 7: Discover storage, components, and dependencies
     progress.start('Discovering storage objects and components');
     const shortImageId = shortDigest(fullImageId);