@tomflow/proflow-dev-tunnel 0.1.21 → 0.1.23

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @tomflow/proflow-dev-tunnel
 
+## 0.1.23
+
+### Patch Changes
+
+- Require live HTTPS ingress readiness before dev-tunnel start reports RUNNING, and clean up the host when readiness fails.
+
+## 0.1.22
+
+### Patch Changes
+
+- Accept Microsoft Dev Tunnel canonical cluster suffixes while preserving the deterministic workspace Tunnel identity.
+
 ## 0.1.21
 
 ### Patch Changes

package/dist/deployment/adapter.d.ts

@@ -28,7 +28,7 @@ export declare function createDevTunnelBehaviorAdapter(dependencies?: {
             readonly ok: true;
             readonly status: "SUCCEEDED";
             readonly moduleRef: "dev-tunnel";
-            readonly moduleVersion: "0.1.21";
+            readonly moduleVersion: "0.1.23";
         };
         observedEffects: never[];
     }>;
@@ -38,14 +38,14 @@ export declare function createDevTunnelBehaviorAdapter(dependencies?: {
             readonly ok: true;
             readonly status: "SUCCEEDED";
             readonly moduleRef: "dev-tunnel";
-            readonly moduleVersion: "0.1.21";
+            readonly moduleVersion: "0.1.23";
         };
         observedEffects: string[];
     } | {
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
@@ -62,7 +62,7 @@ export declare function createDevTunnelBehaviorAdapter(dependencies?: {
             ok: true;
             status: "SUCCEEDED";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             data: {
                 setupStatus: "ACTION_REQUIRED" | "READY";
                 runtimeStatus: "FAILED" | "RUNNING" | "STOPPED";
@@ -89,67 +89,67 @@ export declare function createDevTunnelBehaviorAdapter(dependencies?: {
             ok: true;
             status: "SUCCEEDED";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             data: {
                 docs: string;
             };
         };
         observedEffects: never[];
     }>;
-    readonly start: (context: ModuleCommandContext) => Promise<{
+    readonly stop: (context: ModuleCommandContext) => Promise<{
+        result: {
+            readonly contract: "deployment.result.v1";
+            readonly ok: true;
+            readonly status: "SUCCEEDED";
+            readonly moduleRef: "dev-tunnel";
+            readonly moduleVersion: "0.1.23";
+        };
+        observedEffects: string[];
+    } | {
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
-                code: "START_FAILED";
+                code: "STOP_FAILED";
                 message: string;
                 retryable: boolean;
             };
         };
         observedEffects: never[];
-    } | {
-        result: {
-            contract: "deployment.result.v1";
-            ok: true;
-            status: "SUCCEEDED";
-            moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
-            data: import("../src/resource-adapter.ts").DevTunnelObservation;
-        };
-        observedEffects: string[];
     }>;
-    readonly stop: (context: ModuleCommandContext) => Promise<{
-        result: {
-            readonly contract: "deployment.result.v1";
-            readonly ok: true;
-            readonly status: "SUCCEEDED";
-            readonly moduleRef: "dev-tunnel";
-            readonly moduleVersion: "0.1.21";
-        };
-        observedEffects: string[];
-    } | {
+    readonly start: (context: ModuleCommandContext) => Promise<{
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
-                code: "STOP_FAILED";
+                code: "START_FAILED";
                 message: string;
                 retryable: boolean;
             };
         };
         observedEffects: never[];
+    } | {
+        result: {
+            contract: "deployment.result.v1";
+            ok: true;
+            status: "SUCCEEDED";
+            moduleRef: "dev-tunnel";
+            moduleVersion: "0.1.23";
+            data: import("../src/resource-adapter.ts").DevTunnelObservation;
+        };
+        observedEffects: string[];
     }>;
     readonly setup: (context: ModuleCommandContext) => Promise<{
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
@@ -165,7 +165,7 @@ export declare function createDevTunnelBehaviorAdapter(dependencies?: {
             ok: true;
             status: "SUCCEEDED";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             data: SetupState;
         };
         observedEffects: string[];
@@ -178,7 +178,7 @@ export declare const behaviorAdapter: {
             readonly ok: true;
             readonly status: "SUCCEEDED";
             readonly moduleRef: "dev-tunnel";
-            readonly moduleVersion: "0.1.21";
+            readonly moduleVersion: "0.1.23";
         };
         observedEffects: never[];
     }>;
@@ -188,14 +188,14 @@ export declare const behaviorAdapter: {
             readonly ok: true;
             readonly status: "SUCCEEDED";
             readonly moduleRef: "dev-tunnel";
-            readonly moduleVersion: "0.1.21";
+            readonly moduleVersion: "0.1.23";
         };
         observedEffects: string[];
     } | {
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
@@ -212,7 +212,7 @@ export declare const behaviorAdapter: {
             ok: true;
             status: "SUCCEEDED";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             data: {
                 setupStatus: "ACTION_REQUIRED" | "READY";
                 runtimeStatus: "FAILED" | "RUNNING" | "STOPPED";
@@ -239,67 +239,67 @@ export declare const behaviorAdapter: {
             ok: true;
             status: "SUCCEEDED";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             data: {
                 docs: string;
             };
         };
         observedEffects: never[];
     }>;
-    readonly start: (context: ModuleCommandContext) => Promise<{
+    readonly stop: (context: ModuleCommandContext) => Promise<{
+        result: {
+            readonly contract: "deployment.result.v1";
+            readonly ok: true;
+            readonly status: "SUCCEEDED";
+            readonly moduleRef: "dev-tunnel";
+            readonly moduleVersion: "0.1.23";
+        };
+        observedEffects: string[];
+    } | {
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
-                code: "START_FAILED";
+                code: "STOP_FAILED";
                 message: string;
                 retryable: boolean;
             };
         };
         observedEffects: never[];
-    } | {
-        result: {
-            contract: "deployment.result.v1";
-            ok: true;
-            status: "SUCCEEDED";
-            moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
-            data: import("../src/resource-adapter.ts").DevTunnelObservation;
-        };
-        observedEffects: string[];
     }>;
-    readonly stop: (context: ModuleCommandContext) => Promise<{
-        result: {
-            readonly contract: "deployment.result.v1";
-            readonly ok: true;
-            readonly status: "SUCCEEDED";
-            readonly moduleRef: "dev-tunnel";
-            readonly moduleVersion: "0.1.21";
-        };
-        observedEffects: string[];
-    } | {
+    readonly start: (context: ModuleCommandContext) => Promise<{
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
-                code: "STOP_FAILED";
+                code: "START_FAILED";
                 message: string;
                 retryable: boolean;
             };
         };
         observedEffects: never[];
+    } | {
+        result: {
+            contract: "deployment.result.v1";
+            ok: true;
+            status: "SUCCEEDED";
+            moduleRef: "dev-tunnel";
+            moduleVersion: "0.1.23";
+            data: import("../src/resource-adapter.ts").DevTunnelObservation;
+        };
+        observedEffects: string[];
     }>;
     readonly setup: (context: ModuleCommandContext) => Promise<{
         result: {
             contract: "deployment.result.v1";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             ok: false;
             status: "FAILED";
             error: {
@@ -315,7 +315,7 @@ export declare const behaviorAdapter: {
             ok: true;
             status: "SUCCEEDED";
             moduleRef: "dev-tunnel";
-            moduleVersion: "0.1.21";
+            moduleVersion: "0.1.23";
             data: SetupState;
         };
         observedEffects: string[];

package/dist/deployment/adapter.js

@@ -3,8 +3,8 @@ import { readFileSync } from "node:fs";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
 import { readModuleSharedFacts, writeModuleSharedFacts, } from "@tomflow/proflow-module-contract";
-import { createDevTunnelAutomation, createDevTunnelRuntime, verifyProvisionedPublicBaseUrl, } from "../src/resource-adapter.js";
 import { devTunnelCliPath, resolveDevTunnelCli } from "../src/cli-resolver.js";
+import { createDevTunnelAutomation, createDevTunnelRuntime, verifyProvisionedPublicBaseUrl, } from "../src/resource-adapter.js";
 import { descriptor } from "./descriptor.js";
 const base = {
     contract: "deployment.result.v1",
@@ -367,6 +367,50 @@ export function createDevTunnelBehaviorAdapter(dependencies) {
     const verifyPublicBaseUrl = dependencies?.verifyPublicBaseUrl ?? verifyProvisionedPublicBaseUrl;
     return {
         ...baseBehaviorAdapter,
+        start: async (context) => {
+            const state = await readState(context);
+            if (state?.phase !== "READY" || !state.publicBaseUrl)
+                return baseBehaviorAdapter.start(context);
+            const rt = createRuntime({
+                command: devTunnelCliPath(),
+                tunnelId: state.tunnelId,
+                publicBaseUrl: state.publicBaseUrl,
+                processStateFile: processFile(context),
+            });
+            try {
+                const observed = await rt.start();
+                if (observed.login !== "LOGGED_IN")
+                    throw new Error("Microsoft Dev Tunnel login is not ready");
+                if (observed.state !== "RUNNING")
+                    throw new Error("dev-tunnel did not reach RUNNING");
+                try {
+                    await verifyPublicBaseUrl(state.publicBaseUrl);
+                }
+                catch (error) {
+                    await rt.stop().catch(() => undefined);
+                    throw error;
+                }
+                return {
+                    result: { ...base, data: observed },
+                    observedEffects: [processEffect],
+                };
+            }
+            catch (error) {
+                return {
+                    result: {
+                        ...base,
+                        ok: false,
+                        status: "FAILED",
+                        error: {
+                            code: "START_FAILED",
+                            message: error instanceof Error ? error.message : "failed to start dev-tunnel",
+                            retryable: true,
+                        },
+                    },
+                    observedEffects: [],
+                };
+            }
+        },
         setup: async (context) => {
             try {
                 const previous = await readState(context);

package/dist/deployment/descriptor.d.ts

@@ -3,7 +3,7 @@ export declare const descriptor: {
     readonly contractVersion: "1.0.0";
     readonly moduleRef: "dev-tunnel";
     readonly packageName: "@tomflow/proflow-dev-tunnel";
-    readonly moduleVersion: "0.1.21";
+    readonly moduleVersion: "0.1.23";
     readonly kind: "external-resource";
     readonly templateVersion: "1.0.0";
     readonly platformCompatibility: ">=1.0.0 <2.0.0";

package/dist/deployment/descriptor.js

@@ -3,7 +3,7 @@ export const descriptor = {
     contractVersion: "1.0.0",
     moduleRef: "dev-tunnel",
     packageName: "@tomflow/proflow-dev-tunnel",
-    moduleVersion: "0.1.21",
+    moduleVersion: "0.1.23",
     kind: "external-resource",
     templateVersion: "1.0.0",
     platformCompatibility: ">=1.0.0 <2.0.0",

package/dist/src/cli-resolver.js

@@ -62,7 +62,9 @@ async function version(command) {
     }
 }
 async function sha256(path) {
-    return createHash("sha256").update(await readFile(path)).digest("hex");
+    return createHash("sha256")
+        .update(await readFile(path))
+        .digest("hex");
 }
 async function validCached(path) {
     try {

package/dist/src/resource-adapter.js

@@ -94,6 +94,14 @@ function parseTunnel(input) {
     return z.object({ tunnel: tunnelPayloadSchema }).passthrough().parse(input)
         .tunnel;
 }
+function sameTunnelIdentity(requested, observed) {
+    if (observed === requested)
+        return true;
+    if (requested.includes("."))
+        return false;
+    const prefix = `${requested}.`;
+    return (observed.startsWith(prefix) && !observed.slice(prefix.length).includes("."));
+}
 function parseJson(text, label) {
     try {
         return JSON.parse(text);
@@ -174,7 +182,9 @@ export function createDevTunnelAutomation(input) {
     const command = input?.command ?? "devtunnel";
     const run = input?.runCommand ?? defaultCommandRunner;
     const runRemoteQuery = async (args, retryTimeout = true) => {
-        let result = await run(command, args, { timeoutMs: REMOTE_QUERY_TIMEOUT_MS });
+        let result = await run(command, args, {
+            timeoutMs: REMOTE_QUERY_TIMEOUT_MS,
+        });
         if (!retryTimeout ||
             result.exitCode !== null ||
             !/timed out/i.test(commandText(result)))
@@ -225,7 +235,7 @@ export function createDevTunnelAutomation(input) {
             }
             try {
                 const tunnel = parseTunnel(parseJson(result.stdout, "devtunnel show --json"));
-                if (tunnel.tunnelId !== tunnelId)
+                if (!sameTunnelIdentity(tunnelId, tunnel.tunnelId))
                     return { state: "UNKNOWN", hostState: "UNKNOWN" };
                 const hostState = tunnel.hostConnections !== undefined
                     ? tunnel.hostConnections > 0
@@ -246,9 +256,9 @@ export function createDevTunnelAutomation(input) {
             const result = await run(command, ["create", tunnelId, "--allow-anonymous", "--json"], { timeoutMs: REMOTE_COMMAND_TIMEOUT_MS });
             assertCommandSucceeded(result, "devtunnel create --json");
             const tunnel = parseTunnel(parseJson(result.stdout, "devtunnel create --json"));
-            if (tunnel.tunnelId !== tunnelId)
+            if (!sameTunnelIdentity(tunnelId, tunnel.tunnelId))
                 throw new Error("devtunnel create returned an unexpected tunnelId");
-            return tunnel.tunnelId;
+            return tunnelId;
         },
         async ensurePort(tunnelId, port) {
             const listed = await runRemoteQuery(["port", "list", tunnelId, "--json"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomflow/proflow-dev-tunnel",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/proflow.module.json

@@ -3,7 +3,7 @@
 	"contractVersion": "1.0.0",
 	"moduleRef": "dev-tunnel",
 	"packageName": "@tomflow/proflow-dev-tunnel",
-	"moduleVersion": "0.1.21",
+	"moduleVersion": "0.1.23",
 	"kind": "external-resource",
 	"templateVersion": "1.0.0",
 	"platformCompatibility": ">=1.0.0 <2.0.0",