@oneaddress/setup 1.3.2 → 1.3.4

package/dist/index.js

@@ -856,7 +856,7 @@ var _R = ["\u2588\u2588\u2588\u2588\u2588\u2588 ", "\u2588\u2588   \u2588\u2588"
 var _S = [" \u2588\u2588\u2588\u2588\u2588\u2588", "\u2588\u2588     ", "\u2588\u2588     ", " \u2588\u2588\u2588\u2588\u2588 ", "     \u2588\u2588", "     \u2588\u2588", "\u2588\u2588\u2588\u2588\u2588\u2588 "];
 var ONE_ROWS = Array.from({ length: 7 }, (_3, i) => [_O[i], _N[i], _E[i]].join(" "));
 var ADDR_ROWS = Array.from({ length: 7 }, (_3, i) => [_A[i], _D2[i], _D2[i], _R[i], _E[i], _S[i], _S[i]].join(" "));
-var WIZARD_VERSION = true ? "1.3.2" : "?";
+var WIZARD_VERSION = true ? "1.3.4" : "?";
 function printCompactHeader() {
   const INNER = 42;
   const TOP = fn("\u250C") + dm("\u2500".repeat(INNER)) + fn("\u2510");
@@ -1426,6 +1426,29 @@ app.post('/webhook', async (req: Request, res: Response) => {
     return res.status(200).json({ ok: true });
   }
 
+  // \u2500\u2500 address.test / address.test-dispatch: OneAddress connection-verification
+  // A fabricated test record wrapped to your key. Reaching this line proves
+  // PARTNER_PRIVATE_KEY_PEM decrypted it: a wrong key would have failed the D5
+  // decrypt above and returned 422, never here. Answer { verification: true },
+  // which is what the receiver-verification and go-live checks look for. Return
+  // anything else (including the forward-compat skip below) and the check reads
+  // as "answered but could not decrypt", which is not what happened.
+  if (event === 'address.test' || event === 'address.test-dispatch') {
+    const index = typeof body.index === 'number' ? body.index : undefined;
+    // Print the decrypted record as a verification line for the connection-
+    // verification flow. The portal's verify page asks you to copy these lines
+    // (shaped "N | name | address") out of this console and paste them at the
+    // verify URL in your instruction email; decorative lines around them are
+    // ignored, so pasting the whole block is fine. Returning { verification:true }
+    // is what the go-live and receiver-verification decrypt proofs look for.
+    const a = address as { street?: unknown; suburb?: unknown; state?: unknown; postcode?: unknown };
+    const oneLine = [a.street, [a.suburb, a.state, a.postcode].filter(Boolean).join(' ')]
+      .filter(Boolean).join(', ');
+    console.log(\`[webhook] \${event} verification probe decrypted OK\`);
+    console.log(\`[verification] \${index ?? '?'} | \${ctx.name} | \${oneLine}\`);
+    return res.status(200).json({ verification: true, index });
+  }
+
   // Unknown event \u2014 acknowledge (forward compatibility)
   console.log(\`[webhook] Unknown event "\${event}" \u2014 acknowledged\`);
   return res.status(200).json({ ok: true, skipped: true });
@@ -1892,10 +1915,15 @@ async def webhook(request: Request) -> Response:
     session_share    = body.get("session_key_share")
     legacy_enc       = body.get("address_encrypted")
 
+    # Decrypted display name, captured for the connection-verification probe
+    # below. Identity comes ONLY from decryption, never a cleartext wire field.
+    verified_name = ""
+
     if isinstance(session_envelope, str) and isinstance(session_share, dict):
         try:
             data = _decrypt_session(session_share, session_envelope, PRIVATE_KEY, PARTNER_ID)
             address = data.get("new_address", {})
+            verified_name = data.get("verified_name", "") or ""
         except Exception as e:
             print(f"[webhook] D5 decryption failed \u2014 check OA_PRIVATE_KEY_PEM matches key_id "
                   f"{session_share.get('key_id', '?')}: {e}")
@@ -1904,6 +1932,7 @@ async def webhook(request: Request) -> Response:
     elif isinstance(legacy_enc, dict):
         try:
             address = _decrypt_address(legacy_enc, PRIVATE_KEY, PARTNER_ID)
+            verified_name = address.get("fullName", "") or ""
         except Exception as e:
             print(f"[webhook] Decryption error (check OA_PRIVATE_KEY_PEM): {e}")
             return Response(content='{"ok":false,"error":"decryption failed - partner key mismatch"}',
@@ -1960,6 +1989,25 @@ async def webhook(request: Request) -> Response:
         except Exception as e:
             print(f"[webhook] Callback POST failed: {e}")
 
+    elif event in ("address.test", "address.test-dispatch"):
+        # OneAddress connection-verification probe. Reaching here means the D5
+        # decrypt above succeeded (a wrong key returned 422), which is exactly
+        # what the check proves, so answer verification=true. Anything else reads
+        # as "answered but could not decrypt", which is not what happened. We also
+        # print the decrypted record as a "N | name | address" line: the portal's
+        # verify page asks you to copy these lines from this console and paste
+        # them at the verify URL in your instruction email. Decorative lines are
+        # ignored, so pasting the whole block is fine.
+        idx = body.get("index")
+        _locality = " ".join(str(x) for x in [address.get("suburb", ""),
+                                              address.get("state", ""),
+                                              address.get("postcode", "")] if x)
+        one_line = ", ".join(str(p) for p in [address.get("street", ""), _locality] if p)
+        print(f"[webhook] {event} verification probe decrypted OK")
+        print(f"[verification] {idx if idx is not None else '?'} | {verified_name} | {one_line}")
+        return Response(content=json.dumps({"verification": True, "index": body.get("index")}),
+                        media_type="application/json")
+
     else:
         print(f"[webhook] Unknown event '{event}' \u2014 acknowledged")
 
@@ -2517,6 +2565,26 @@ public class OneAddressWebhookController {
             } else if ("address.verify".equals(event)) {
                 handleAddressVerify(body, address, accountNumber, verifiedName, knownNames);
                 if (dispatchId != null && !dispatchId.isBlank()) store.markProcessed(dispatchId, "verify");
+            } else if ("address.test".equals(event) || "address.test-dispatch".equals(event)) {
+                // OneAddress connection-verification probe. Reaching here means the
+                // D5 decrypt above succeeded (a wrong key returned 422), which is
+                // what the check proves, so answer verification=true. We also print
+                // the decrypted record as a "N | name | address" line: the portal's
+                // verify page asks you to copy these lines from this console and
+                // paste them at the verify URL in your instruction email.
+                if (dispatchId != null && !dispatchId.isBlank()) store.markProcessed(dispatchId, "verification:ok");
+                Object idx = body.get("index");
+                java.util.function.Function<String, String> fld = k -> {
+                    Object v = address.get(k);
+                    return v == null ? "" : String.valueOf(v);
+                };
+                String oaLoc = java.util.stream.Stream.of(fld.apply("suburb"), fld.apply("state"), fld.apply("postcode"))
+                    .filter(s -> !s.isBlank()).collect(java.util.stream.Collectors.joining(" "));
+                String oaLine = java.util.stream.Stream.of(fld.apply("street"), oaLoc)
+                    .filter(s -> !s.isBlank()).collect(java.util.stream.Collectors.joining(", "));
+                log.info("[OneAddress] {} verification probe decrypted OK", event);
+                log.info("[verification] {} | {} | {}", idx == null ? "?" : idx, verifiedName, oaLine);
+                return ResponseEntity.ok("{\\"verification\\":true,\\"index\\":" + (idx == null ? "null" : idx.toString()) + "}");
             } else {
                 log.info("[OneAddress] skipping unknown event: {}", event);
                 if (dispatchId != null && !dispatchId.isBlank()) store.markProcessed(dispatchId, "ignored:unknown-event");
@@ -3285,7 +3353,11 @@ app.MapPost("/webhooks/oneaddress", async (HttpRequest request) =>
 
     var eventType = body.TryGetProperty("event", out var evtEl) ? evtEl.GetString() : null;
 
-    if (eventType != "address.updated" && eventType != "address.verify")
+    // address.test / address.test-dispatch (the connection-verification probe)
+    // must pass this guard so it reaches the decrypt below; a wrong key then
+    // returns 422 and only a real decrypt reaches the verification answer.
+    if (eventType != "address.updated" && eventType != "address.verify"
+        && eventType != "address.test" && eventType != "address.test-dispatch")
     {
         app.Logger.LogInformation("[OneAddress] skipping unknown event: {EventType}", eventType);
         return Results.Json(new { ok = true, skipped = true });
@@ -3366,6 +3438,27 @@ app.MapPost("/webhooks/oneaddress", async (HttpRequest request) =>
             app.Logger.LogWarning("[OneAddress] dispatch {DispatchId} received before but never completed \u2014 reprocessing", dispatchId);
     }
 
+    if (eventType == "address.test" || eventType == "address.test-dispatch")
+    {
+        // OneAddress connection-verification probe. Reaching here means the D5
+        // decrypt above succeeded (a wrong key returned 422), which is what the
+        // check proves, so answer verification=true. We also print the decrypted
+        // record as a "N | name | address" line: the portal's verify page asks
+        // you to copy these lines from this console and paste them at the verify
+        // URL in your instruction email.
+        int? index = body.TryGetProperty("index", out var idxEl) && idxEl.ValueKind == JsonValueKind.Number
+            ? idxEl.GetInt32() : (int?)null;
+        static string OaStr(JsonElement a, string k) =>
+            a.TryGetProperty(k, out var el) && el.ValueKind == JsonValueKind.String ? (el.GetString() ?? "") : "";
+        var oaLoc  = string.Join(" ", new[] { OaStr(address, "suburb"), OaStr(address, "state"), OaStr(address, "postcode") }
+            .Where(s => !string.IsNullOrWhiteSpace(s)));
+        var oaLine = string.Join(", ", new[] { OaStr(address, "street"), oaLoc }
+            .Where(s => !string.IsNullOrWhiteSpace(s)));
+        app.Logger.LogInformation("[OneAddress] {EventType} verification probe decrypted OK", eventType);
+        app.Logger.LogInformation("[verification] {Line}", (index?.ToString() ?? "?") + " | " + verifiedName + " | " + oaLine);
+        return Results.Json(new { verification = true, index });
+    }
+
     if (eventType == "address.updated")
     {
         // Work FIRST, respond after. Acknowledging before the write commits
@@ -4203,6 +4296,41 @@ func main() {
 				_ = store.MarkProcessed(dispatch, "verify:"+result)
 			}
 
+		case "address.test", "address.test-dispatch":
+			// OneAddress connection-verification probe. Reaching this case means the
+			// decrypt above succeeded (a wrong key returned 422), which is what the
+			// check proves, so answer verification=true rather than the ok:true below.
+			// We also print the decrypted record as a "N | name | address" line: the
+			// portal's verify page asks you to copy these lines from this console and
+			// paste them at the verify URL in your instruction email.
+			log.Printf("[webhook] %s verification probe decrypted OK", event)
+			if dispatch != "" {
+				_ = store.MarkProcessed(dispatch, "verification:ok")
+			}
+			var idx any = nil
+			if v, ok := parsed["index"]; ok {
+				idx = v
+			}
+			var locParts []string
+			for _, s := range []string{str(address, "suburb"), str(address, "state"), str(address, "postcode")} {
+				if s != "" {
+					locParts = append(locParts, s)
+				}
+			}
+			var lineParts []string
+			for _, s := range []string{str(address, "street"), strings.Join(locParts, " ")} {
+				if s != "" {
+					lineParts = append(lineParts, s)
+				}
+			}
+			idxStr := "?"
+			if idx != nil {
+				idxStr = fmt.Sprintf("%v", idx)
+			}
+			log.Printf("[verification] %s | %s | %s", idxStr, verifiedName, strings.Join(lineParts, ", "))
+			jsonResp(w, 200, map[string]any{"verification": true, "index": idx})
+			return
+
 		default:
 			log.Printf("[webhook] Unknown event %q \u2014 acknowledged", event)
 			if dispatch != "" {
@@ -4869,7 +4997,11 @@ Route::post('/webhook', function (Request $request): Response {
 
     $eventType = $body['event'] ?? '';
 
-    if ($eventType !== 'address.updated' && $eventType !== 'address.verify') {
+    // address.test / address.test-dispatch (the connection-verification probe)
+    // must pass this guard so it reaches the decrypt below; a wrong key then
+    // returns 422 and only a real decrypt reaches the verification answer.
+    if ($eventType !== 'address.updated' && $eventType !== 'address.verify'
+        && $eventType !== 'address.test' && $eventType !== 'address.test-dispatch') {
         return response()->json(['ok' => true, 'skipped' => true]);
     }
 
@@ -5038,6 +5170,22 @@ Route::post('/webhook', function (Request $request): Response {
         }
     }
 
+    if ($eventType === 'address.test' || $eventType === 'address.test-dispatch') {
+        // OneAddress connection-verification probe. Reaching here means the D5
+        // decrypt above succeeded (a wrong key returned 422), which is what the
+        // check proves, so answer verification=true. We also print the decrypted
+        // record as a "N | name | address" line: the portal's verify page asks
+        // you to copy these lines from this console and paste them at the verify
+        // URL in your instruction email.
+        $oaAddr = is_array($address) ? $address : [];
+        $oaKeep = static fn($s) => $s !== null && $s !== '';
+        $oaLoc  = implode(' ', array_filter([$oaAddr['suburb'] ?? '', $oaAddr['state'] ?? '', $oaAddr['postcode'] ?? ''], $oaKeep));
+        $oaLine = implode(', ', array_filter([$oaAddr['street'] ?? '', $oaLoc], $oaKeep));
+        \\Log::info('[OneAddress] verification probe decrypted OK', ['event' => $eventType]);
+        \\Log::info('[verification] ' . ($body['index'] ?? '?') . ' | ' . $verifiedName . ' | ' . $oaLine);
+        return response()->json(['verification' => true, 'index' => $body['index'] ?? null]);
+    }
+
     if ($eventType === 'address.updated') {
         // Work FIRST, respond after. Acknowledging before the write commits
         // marks the dispatch delivered on a failure that is never retried.
@@ -5224,7 +5372,7 @@ async function scaffold(platform, outputDir, partnerId, webhookSecret, webhookUr
 
 // src/register.ts
 var import_node_crypto = require("crypto");
-var PKG_VERSION = true ? "1.3.2" : "dev";
+var PKG_VERSION = true ? "1.3.4" : "dev";
 var REGISTER_URL = "https://partners.oneaddress.io/api/partner/installs";
 function hmacSha256(secret, message) {
   return (0, import_node_crypto.createHmac)("sha256", secret).update(message).digest("hex");
@@ -6284,21 +6432,36 @@ Continuing will overwrite it.`
     s4.start("Starting Cloudflare Tunnel");
     onCleanup(stopTunnel);
     try {
-      const tunnel = await startTunnel(3001);
+      let tunnel = await startTunnel(3001);
       webhookUrl = `${tunnel.url}/webhook`;
       tunnelBase = tunnel.url;
       s4.stop(`Tunnel active: ${tunnel.url}`);
       M2.warn(
-        "IMPORTANT: This tunnel URL is temporary \u2014 it expires when this process stops.\nBefore going to production, deploy to a permanent server and update the webhook URL in the portal."
+        "IMPORTANT: This tunnel URL is temporary. It lives only while this wizard\nkeeps running, and every run gets a new address. Before going to production,\ndeploy to a permanent server and update the webhook URL in the portal."
       );
       const s4b = Y2();
       s4b.start("Waiting for the tunnel to start routing");
-      const ready = await waitForTunnelReady(tunnel.url);
-      webhookReady = ready;
-      s4b.stop(ready ? "Tunnel is routing" : "Tunnel is slow to come online");
-      if (!ready) {
+      webhookReady = await waitForTunnelReady(tunnel.url);
+      if (!webhookReady) {
+        s4b.stop("First tunnel is slow to route, trying a fresh one");
+        stopTunnel();
+        tunnel = await startTunnel(3001);
+        webhookUrl = `${tunnel.url}/webhook`;
+        tunnelBase = tunnel.url;
+        const s4c = Y2();
+        s4c.start(`Waiting for the new tunnel to route: ${tunnel.url}`);
+        webhookReady = await waitForTunnelReady(tunnel.url, { budgetMs: 45e3 });
+        s4c.stop(webhookReady ? "Tunnel is routing" : "Tunnel still not routing");
+      } else {
+        s4b.stop("Tunnel is routing");
+      }
+      if (!webhookReady) {
         M2.warn(
-          "The tunnel edge has not answered yet. This is a Cloudflare warmup delay,\nnot your server, which is running on :3001. The wizard will wait once more\nbefore the conformance checks so a cold tunnel does not read as a failure."
+          `The tunnel edge is still not routing after a retry. This is almost always
+one of two things, and neither is your server (it is running on :3001):
+  1. Open ${tunnel.url}/health in a browser. If it never loads, your network
+     is blocking cloudflared and no wait will fix it, so try a different network.
+  2. The tunnel only lives while this wizard runs, so keep this window open.`
         );
       }
     } catch (err) {
@@ -6341,7 +6504,10 @@ Continuing will overwrite it.`
     }
     if (!webhookReady) {
       M2.warn(
-        "Skipping the conformance checks: the Cloudflare tunnel edge has not come online.\nThis is a tunnel warmup delay, not your server, which is running on :3001.\nRe-run the wizard, or run `npm test` once the tunnel URL responds in a browser."
+        `Skipping the conformance checks: the tunnel edge is not routing.
+Your server is fine, it is running on :3001. This is either your network
+blocking cloudflared (open ${tunnelBase}/health in a browser to check) or the
+tunnel needing this wizard to stay open. Re-run once that URL loads in a browser.`
       );
     } else {
       M2.info("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneaddress/setup",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Interactive setup wizard for OneAddress partner webhook integrations",
   "main": "dist/index.js",
   "bin": {