@crossdelta/infrastructure 0.8.1 → 0.8.3

package/dist/core/runtime.d.ts

@@ -188,6 +188,8 @@ export interface RuntimeDeploymentConfig {
 export interface RuntimeDeploymentResult {
     /** NATS internal URL */
     natsUrl?: pulumi.Output<string>;
+    /** NATS Helm release resource (for dependsOn in downstream jobs) */
+    natsRelease?: pulumi.Resource;
     /** LoadBalancer IP (if ingress enabled) */
     loadBalancerIp?: pulumi.Output<string>;
     /** Cert manager ready */

package/dist/helpers/stream-job.d.ts

@@ -14,11 +14,11 @@
  */
 import type { Provider } from '@pulumi/kubernetes';
 import * as k8s from '@pulumi/kubernetes';
-import type { Output } from '@pulumi/pulumi';
+import type { Output, Resource } from '@pulumi/pulumi';
 import type { StreamPolicy } from './deploy-streams';
 import { type ResolvedStream } from './stream-setup';
-export type { ResolvedStream };
 export { computeConfigHash, generateSetupScript, msToNatsDuration, resolveStreams } from './stream-setup';
+export type { ResolvedStream };
 export interface MaterializeStreamsConfig {
     /** NATS connection URL (cluster-internal) */
     natsUrl: Output<string>;
@@ -37,8 +37,10 @@ export interface MaterializeStreamsConfig {
     image?: string;
     /** Job TTL after completion in seconds (default: 300) */
     ttlAfterFinished?: number;
-    /** Max retry attempts (default: 3) */
+    /** Max retry attempts (default: 6) */
     backoffLimit?: number;
+    /** Pulumi resources the Job depends on (e.g., NATS Helm release) */
+    dependsOn?: Resource[];
 }
 /**
  * Materialize NATS JetStream streams via a K8s Job.

package/dist/helpers/stream-setup.d.ts

@@ -35,7 +35,7 @@ export declare const resolveStreams: (definitions: StreamDefinition[], policies?
  */
 export declare const generateSetupScript: (streams: ResolvedStream[]) => string;
 /**
- * Compute a short hash from stream config for change detection.
- * When config changes, the Job name changes → Pulumi recreates it.
+ * Compute a short hash from stream config + script for change detection.
+ * When config or script template changes, the Job name changes → Pulumi recreates it.
  */
-export declare const computeConfigHash: (streams: ResolvedStream[]) => string;
+export declare const computeConfigHash: (streams: ResolvedStream[], script?: string) => string;

package/dist/index.cjs

@@ -352,7 +352,7 @@ function deployNginxIngress(provider, config = {}) {
 var k8s3 = __toESM(require("@pulumi/kubernetes"));
 var pulumi2 = __toESM(require("@pulumi/pulumi"));
 var NATS_DEFAULTS = {
-  replicas: 3,
+  replicas: 1,
   jetstream: {
     enabled: true,
     storageSize: "20Gi",
@@ -537,6 +537,7 @@ function deployRuntime(provider, namespace, config, runtimeProvider) {
   if (config.nats?.enabled && providerName === "doks") {
     const nats = deployNats(provider, namespace, config.nats.config || {});
     result.natsUrl = pulumi3.output(nats.internalUrl);
+    result.natsRelease = nats.release;
   }
   if (config.ingress?.enabled && providerName === "doks") {
     const ingress = deployNginxIngress(provider, config.ingress.config || {});
@@ -1011,6 +1012,20 @@ var generateSetupScript = (streams) => {
     `  NATS_OPTS="$NATS_OPTS --user $NATS_USER --password $NATS_PASSWORD"`,
     `fi`,
     ``,
+    `echo "⏳ Waiting for NATS to become available..."`,
+    `RETRIES=0`,
+    `MAX_RETRIES=30`,
+    `until nats $NATS_OPTS server ping --count 1 > /dev/null 2>&1; do`,
+    `  RETRIES=$((RETRIES + 1))`,
+    `  if [ "$RETRIES" -ge "$MAX_RETRIES" ]; then`,
+    `    echo "❌ NATS not available after $MAX_RETRIES attempts"`,
+    `    exit 1`,
+    `  fi`,
+    `  echo "  NATS not ready (attempt $RETRIES/$MAX_RETRIES), retrying in 2s..."`,
+    `  sleep 2`,
+    `done`,
+    `echo "✅ NATS is available"`,
+    ``,
     `echo "\uD83D\uDE80 Materializing ${streams.length} stream(s)..."`,
     `echo ""`,
     ``,
@@ -1020,8 +1035,8 @@ var generateSetupScript = (streams) => {
   ].join(`
 `);
 };
-var computeConfigHash = (streams) => {
-  const data = JSON.stringify(streams);
+var computeConfigHash = (streams, script) => {
+  const data = JSON.stringify(streams) + (script ?? "");
   let hash = 0;
   for (let i = 0;i < data.length; i++) {
     const char = data.charCodeAt(i);
@@ -1045,13 +1060,14 @@ var materializeStreams = (provider, namespace, config) => {
     defaults = DEFAULT_POLICY2,
     image = NATS_BOX_IMAGE,
     ttlAfterFinished = 300,
-    backoffLimit = 3
+    backoffLimit = 6,
+    dependsOn: externalDeps = []
   } = config;
   validateStreamDefinitions(contracts);
   const definitions = collectStreamDefinitions(contracts);
   const resolved = resolveStreams(definitions, policies, defaults);
   const script = generateSetupScript(resolved);
-  const configHash = computeConfigHash(resolved);
+  const configHash = computeConfigHash(resolved, script);
   console.log(`\uD83D\uDCCB Collecting stream definitions from contracts...`);
   console.log(`✅ Found ${definitions.length} stream(s):`);
   for (const { stream, subjects } of definitions) {
@@ -1067,7 +1083,7 @@ var materializeStreams = (provider, namespace, config) => {
       "setup.sh": script,
       "streams.json": JSON.stringify(resolved, null, 2)
     }
-  }, { provider });
+  }, { provider, deleteBeforeReplace: true });
   const envVars = [{ name: "NATS_URL", value: config.natsUrl }];
   if (config.credentials?.user) {
     envVars.push({ name: "NATS_USER", value: config.credentials.user });
@@ -1110,7 +1126,7 @@ var materializeStreams = (provider, namespace, config) => {
     }
   }, {
     provider,
-    dependsOn: [configMap],
+    dependsOn: [configMap, ...externalDeps],
     deleteBeforeReplace: true
   });
   return job;

package/dist/index.js

@@ -258,7 +258,7 @@ function deployNginxIngress(provider, config = {}) {
 import * as k8s3 from "@pulumi/kubernetes";
 import * as pulumi2 from "@pulumi/pulumi";
 var NATS_DEFAULTS = {
-  replicas: 3,
+  replicas: 1,
   jetstream: {
     enabled: true,
     storageSize: "20Gi",
@@ -443,6 +443,7 @@ function deployRuntime(provider, namespace, config, runtimeProvider) {
   if (config.nats?.enabled && providerName === "doks") {
     const nats = deployNats(provider, namespace, config.nats.config || {});
     result.natsUrl = pulumi3.output(nats.internalUrl);
+    result.natsRelease = nats.release;
   }
   if (config.ingress?.enabled && providerName === "doks") {
     const ingress = deployNginxIngress(provider, config.ingress.config || {});
@@ -917,6 +918,20 @@ var generateSetupScript = (streams) => {
     `  NATS_OPTS="$NATS_OPTS --user $NATS_USER --password $NATS_PASSWORD"`,
     `fi`,
     ``,
+    `echo "⏳ Waiting for NATS to become available..."`,
+    `RETRIES=0`,
+    `MAX_RETRIES=30`,
+    `until nats $NATS_OPTS server ping --count 1 > /dev/null 2>&1; do`,
+    `  RETRIES=$((RETRIES + 1))`,
+    `  if [ "$RETRIES" -ge "$MAX_RETRIES" ]; then`,
+    `    echo "❌ NATS not available after $MAX_RETRIES attempts"`,
+    `    exit 1`,
+    `  fi`,
+    `  echo "  NATS not ready (attempt $RETRIES/$MAX_RETRIES), retrying in 2s..."`,
+    `  sleep 2`,
+    `done`,
+    `echo "✅ NATS is available"`,
+    ``,
     `echo "\uD83D\uDE80 Materializing ${streams.length} stream(s)..."`,
     `echo ""`,
     ``,
@@ -926,8 +941,8 @@ var generateSetupScript = (streams) => {
   ].join(`
 `);
 };
-var computeConfigHash = (streams) => {
-  const data = JSON.stringify(streams);
+var computeConfigHash = (streams, script) => {
+  const data = JSON.stringify(streams) + (script ?? "");
   let hash = 0;
   for (let i = 0;i < data.length; i++) {
     const char = data.charCodeAt(i);
@@ -951,13 +966,14 @@ var materializeStreams = (provider, namespace, config) => {
     defaults = DEFAULT_POLICY2,
     image = NATS_BOX_IMAGE,
     ttlAfterFinished = 300,
-    backoffLimit = 3
+    backoffLimit = 6,
+    dependsOn: externalDeps = []
   } = config;
   validateStreamDefinitions(contracts);
   const definitions = collectStreamDefinitions(contracts);
   const resolved = resolveStreams(definitions, policies, defaults);
   const script = generateSetupScript(resolved);
-  const configHash = computeConfigHash(resolved);
+  const configHash = computeConfigHash(resolved, script);
   console.log(`\uD83D\uDCCB Collecting stream definitions from contracts...`);
   console.log(`✅ Found ${definitions.length} stream(s):`);
   for (const { stream, subjects } of definitions) {
@@ -973,7 +989,7 @@ var materializeStreams = (provider, namespace, config) => {
       "setup.sh": script,
       "streams.json": JSON.stringify(resolved, null, 2)
     }
-  }, { provider });
+  }, { provider, deleteBeforeReplace: true });
   const envVars = [{ name: "NATS_URL", value: config.natsUrl }];
   if (config.credentials?.user) {
     envVars.push({ name: "NATS_USER", value: config.credentials.user });
@@ -1016,7 +1032,7 @@ var materializeStreams = (provider, namespace, config) => {
     }
   }, {
     provider,
-    dependsOn: [configMap],
+    dependsOn: [configMap, ...externalDeps],
     deleteBeforeReplace: true
   });
   return job;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "type": "module",
   "license": "MIT",
   "publishConfig": {
@@ -35,7 +35,7 @@
     }
   },
   "dependencies": {
-    "@crossdelta/cloudevents": "^0.7.14"
+    "@crossdelta/cloudevents": "^0.7.18"
   },
   "peerDependencies": {
     "@pulumi/digitalocean": "^4.0.0",