@partylayer/provider 0.5.1 → 0.6.0

package/dist/index.mjs

@@ -513,7 +513,7 @@ var PartyLayerProvider = class {
 };
 
 // src/bridge.ts
-var PROVIDER_VERSION = "0.5.1" ;
+var PROVIDER_VERSION = "0.6.0" ;
 function createProviderBridge(client) {
   const eventBus = new CIP0103EventBus();
   const pendingEmitted = /* @__PURE__ */ new Set();
@@ -615,15 +615,17 @@ async function handleRequest(client, args, eventBus, pendingEmitted) {
           const signResult = await client.signTransaction({ tx: p });
           const session = await client.getActiveSession();
           const partyId = String(signResult.partyId ?? session?.partyId ?? "unknown");
-          eventBus.emit(CIP0103_EVENTS.TX_CHANGED, {
-            status: "signed",
-            commandId: cmdId,
-            payload: {
-              signature: String(signResult.transactionHash),
-              signedBy: partyId,
-              party: partyId
-            }
-          });
+          if (signResult.transactionHash !== void 0) {
+            eventBus.emit(CIP0103_EVENTS.TX_CHANGED, {
+              status: "signed",
+              commandId: cmdId,
+              payload: {
+                signature: String(signResult.transactionHash),
+                signedBy: partyId,
+                party: partyId
+              }
+            });
+          }
           try {
             const receipt = await client.submitTransaction({
               signedTx: signResult.signedTx ?? signResult.transactionHash
@@ -633,7 +635,11 @@ async function handleRequest(client, args, eventBus, pendingEmitted) {
               status: "executed",
               commandId: cmdId,
               payload: {
-                updateId: receipt.updateId ?? receipt.commandId ?? String(receipt.transactionHash),
+                // All three are real identifiers — the receipt's update id, the
+                // wallet's command id, or the bridge's own command id for this
+                // operation. `String(receipt.transactionHash)` was the old tail
+                // and would now stringify `undefined`.
+                updateId: receipt.updateId ?? receipt.commandId ?? cmdId,
                 completionOffset: 0
               }
             });
@@ -904,12 +910,13 @@ function isCIP0103Provider(obj) {
   const p = obj;
   return typeof p.request === "function" && typeof p.on === "function" && typeof p.emit === "function" && typeof p.removeListener === "function";
 }
-function discoverInjectedProviders() {
+function discoverInjectedProviders(extraPaths) {
   if (typeof window === "undefined") return [];
   const discovered = [];
   const seen = /* @__PURE__ */ new Set();
   const win = window;
-  for (const path of KNOWN_INJECTION_PATHS) {
+  const paths = extraPaths && extraPaths.length > 0 ? [.../* @__PURE__ */ new Set([...KNOWN_INJECTION_PATHS, ...extraPaths])] : KNOWN_INJECTION_PATHS;
+  for (const path of paths) {
     const candidate = win[path];
     if (candidate === void 0 || candidate === null) continue;
     if (isCIP0103Provider(candidate) && !seen.has(candidate)) {
@@ -970,6 +977,41 @@ var CANTON_ANNOUNCE_PROVIDER_EVENT = "canton:announceProvider";
 function defaultAnnounceProvider(announced) {
   return createExtensionChannelProvider({ target: announced.target ?? announced.id });
 }
+function firstNonEmptyString(...vals) {
+  for (const v of vals) {
+    if (typeof v === "string" && v.length > 0) return v;
+  }
+  return void 0;
+}
+var warnedAnnounceShapes = /* @__PURE__ */ new Set();
+function announceShapeKey(detail, info) {
+  const top = Object.keys(detail).sort().join(",");
+  const inner = info ? Object.keys(info).sort().join(",") : "";
+  return `${top}|${inner}`;
+}
+function readAnnouncedWallet(detail) {
+  if (!detail) return void 0;
+  const info = typeof detail.info === "object" && detail.info !== null ? detail.info : void 0;
+  const id = firstNonEmptyString(detail.providerId, detail.id, info?.uuid, info?.rdns);
+  if (id === void 0) {
+    if (typeof process !== "undefined" && process.env.NODE_ENV !== "production") {
+      const key = announceShapeKey(detail, info);
+      if (!warnedAnnounceShapes.has(key)) {
+        warnedAnnounceShapes.add(key);
+        console.warn(
+          "[PartyLayer] Ignored a canton:announceProvider event: no readable provider id (expected a non-empty string at detail.providerId, detail.id, or detail.info.uuid). See https://partylayer.xyz/docs/generic-bridge"
+        );
+      }
+    }
+    return void 0;
+  }
+  return {
+    id,
+    name: firstNonEmptyString(detail.name, info?.name),
+    icon: firstNonEmptyString(detail.icon, info?.icon),
+    target: firstNonEmptyString(detail.target)
+  };
+}
 async function discoverAnnouncedProviders(options = {}) {
   if (typeof window === "undefined") return [];
   const timeoutMs = options.timeoutMs ?? 300;
@@ -977,16 +1019,10 @@ async function discoverAnnouncedProviders(options = {}) {
   const announced = /* @__PURE__ */ new Map();
   const onAnnounce = (event) => {
     const detail = event.detail;
-    if (!detail) return;
-    const rawId = detail.providerId ?? detail.id;
-    if (typeof rawId !== "string" || rawId.length === 0) return;
-    if (announced.has(rawId)) return;
-    announced.set(rawId, {
-      id: rawId,
-      name: typeof detail.name === "string" ? detail.name : void 0,
-      icon: typeof detail.icon === "string" ? detail.icon : void 0,
-      target: typeof detail.target === "string" ? detail.target : void 0
-    });
+    const wallet = readAnnouncedWallet(detail);
+    if (!wallet) return;
+    if (announced.has(wallet.id)) return;
+    announced.set(wallet.id, wallet);
   };
   window.addEventListener(
     CANTON_ANNOUNCE_PROVIDER_EVENT,
@@ -1027,17 +1063,10 @@ function subscribeAnnouncedProviders(onProvider, options = {}) {
   const seen = /* @__PURE__ */ new Set();
   const onAnnounce = (event) => {
     const detail = event.detail;
-    if (!detail) return;
-    const rawId = detail.providerId ?? detail.id;
-    if (typeof rawId !== "string" || rawId.length === 0) return;
-    if (seen.has(rawId)) return;
-    seen.add(rawId);
-    const wallet = {
-      id: rawId,
-      name: typeof detail.name === "string" ? detail.name : void 0,
-      icon: typeof detail.icon === "string" ? detail.icon : void 0,
-      target: typeof detail.target === "string" ? detail.target : void 0
-    };
+    const wallet = readAnnouncedWallet(detail);
+    if (!wallet) return;
+    if (seen.has(wallet.id)) return;
+    seen.add(wallet.id);
     void Promise.resolve().then(() => make(wallet)).then((provider) => {
       if (!isCIP0103Provider(provider)) return;
       onProvider({
@@ -1108,7 +1137,7 @@ async function resolveInjectedKey(d) {
   return { key: d.id, resolved: false };
 }
 async function discoverProviders(options = {}) {
-  const injected = discoverInjectedProviders();
+  const injected = discoverInjectedProviders(options.injectionPaths);
   const announcedResults = await discoverAnnouncedProviders(options);
   const injectedKeys = await Promise.all(injected.map(resolveInjectedKey));
   const out = [];