@xrpl-wallet-kit/adapter-crossmark 0.1.5 → 0.1.7

package/dist/index.d.ts

@@ -89,6 +89,7 @@ export declare class CrossmarkAdapter extends BaseWalletAdapter {
     private resolvePassiveNetwork;
     private randomHex;
     private pickString;
+    private withAbort;
 }
 export declare function createCrossmarkAdapter(options?: CrossmarkAdapterOptions): CrossmarkAdapter;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA6D,MAAM,uBAAuB,CAAC;AACrH,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEzJ,eAAO,MAAM,cAAc,+gWAA+gW,CAAC;AAE3iW,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE;QACL,WAAW,IAAI,OAAO,GAAG,SAAS,CAAC;QACnC,WAAW,CAAC,EAAE,MAAM,OAAO,GAAG,SAAS,CAAC;QACxC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;QACtC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;KAC5B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,QAAQ,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC,CAAC;QAC3F,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1D,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAKD,qBAAa,gBAAiB,SAAQ,iBAAiB;IAIzC,OAAO,CAAC,OAAO;IAH3B,QAAQ,EAAE,cAAc,CAAwG;IAChI,YAAY,EAAE,kBAAkB,CAA8F;gBAE1G,OAAO,GAAE,uBAA4B;IAEzD,WAAW,IAAI,OAAO;IAKhB,OAAO,CAAC,OAAO,EAAE,cAAc;;;;;;;;uBAvBoB;gBAAE,IAAI,CAAC,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI;;;IAgC5E,cAAc,CAAC,OAAO,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAYrC,WAAW,CAAC,OAAO,EAAE,kBAAkB;;;;;;uBA5CY;gBAAE,IAAI,CAAC,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI;;;IA8E5E,aAAa,CAAC,OAAO,EAAE,oBAAoB;IAKjD,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,UAAU;CAInB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,uBAAuB,oBAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA6D,MAAM,uBAAuB,CAAC;AACrH,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEzJ,eAAO,MAAM,cAAc,+gWAA+gW,CAAC;AAE3iW,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE;QACL,WAAW,IAAI,OAAO,GAAG,SAAS,CAAC;QACnC,WAAW,CAAC,EAAE,MAAM,OAAO,GAAG,SAAS,CAAC;QACxC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;QACtC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;KAC5B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,QAAQ,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC,CAAC;QAC3F,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1D,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAKD,qBAAa,gBAAiB,SAAQ,iBAAiB;IAIzC,OAAO,CAAC,OAAO;IAH3B,QAAQ,EAAE,cAAc,CAAwG;IAChI,YAAY,EAAE,kBAAkB,CAA8F;gBAE1G,OAAO,GAAE,uBAA4B;IAEzD,WAAW,IAAI,OAAO;IAKhB,OAAO,CAAC,OAAO,EAAE,cAAc;;;;;;;;uBAvBoB;gBAAE,IAAI,CAAC,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI;;;IAgC5E,cAAc,CAAC,OAAO,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAYrC,WAAW,CAAC,OAAO,EAAE,kBAAkB;;;;;;uBA5CY;gBAAE,IAAI,CAAC,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI;;;IA8E5E,aAAa,CAAC,OAAO,EAAE,oBAAoB;IAKjD,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,SAAS;CA6BlB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,uBAAuB,oBAA2C"}

package/dist/index.js

@@ -14,7 +14,7 @@ export class CrossmarkAdapter extends BaseWalletAdapter {
     }
     async connect(options) {
         const signInAndWait = this.requireMethod("signInAndWait");
-        const result = await signInAndWait(this.randomHex());
+        const result = await this.withAbort(signInAndWait(this.randomHex()), options.signal);
         const address = this.pickString(result, ["response.data.address", "response.address", "address"]);
         if (!address)
             throw new Error("Crossmark did not return an XRPL address");
@@ -122,5 +122,36 @@ export class CrossmarkAdapter extends BaseWalletAdapter {
         const value = pickPath(source, paths);
         return typeof value === "string" && value.trim() ? value : undefined;
     }
+    withAbort(promise, signal) {
+        if (!signal)
+            return promise;
+        if (signal.aborted)
+            return Promise.reject(createWalletError.connectionRejected(this.metadata.name, new Error("Connection was cancelled")));
+        return new Promise((resolve, reject) => {
+            let settled = false;
+            const cleanup = () => signal.removeEventListener("abort", abort);
+            const abort = () => {
+                if (settled)
+                    return;
+                settled = true;
+                cleanup();
+                reject(createWalletError.connectionRejected(this.metadata.name, new Error("Connection was cancelled")));
+            };
+            signal.addEventListener("abort", abort, { once: true });
+            promise.then((value) => {
+                if (settled)
+                    return;
+                settled = true;
+                cleanup();
+                resolve(value);
+            }, (error) => {
+                if (settled)
+                    return;
+                settled = true;
+                cleanup();
+                reject(error);
+            });
+        });
+    }
 }
 export function createCrossmarkAdapter(options) { return new CrossmarkAdapter(options); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xrpl-wallet-kit/adapter-crossmark",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Crossmark adapter for XRPL Wallet Kit.",
   "license": "MIT",
   "type": "module",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@crossmarkio/sdk": "^0.4.0",
-    "@xrpl-wallet-kit/core": "0.1.5"
+    "@xrpl-wallet-kit/core": "0.1.7"
   },
   "publishConfig": {
     "access": "public"