@polymarket/relayer-client 0.0.2 → 0.0.4

package/dist/auth/handler.js

@@ -23,11 +23,7 @@ class AuthHandler {
             if (this.token == undefined) {
                 throw new Error("authorization token missing");
             }
-            const resp = yield http_helpers_1.raw_get(`${this.url}/login`, {
-                headers: {
-                    Authorization: `Bearer ${this.token}`
-                },
-            });
+            const resp = yield http_helpers_1.request(`${this.url}/login`, http_helpers_1.GET, { Authorization: `Bearer ${this.token}` });
             const cookies = resp.headers['set-cookie'];
             let aggregatedCookie = "";
             for (const cookie of cookies) {

package/dist/client.d.ts

@@ -5,9 +5,8 @@ export declare class RelayClient {
     readonly relayerUrl: string;
     readonly chainId: number;
     readonly signer?: Wallet | JsonRpcSigner;
-    readonly wsRelayerUrl?: string;
-    private authHandler;
-    constructor(relayerUrl: string, chainId: number, authArgs: AuthArgs, signer?: Wallet | JsonRpcSigner, wsRelayerUrl?: string);
+    private authHandler?;
+    constructor(relayerUrl: string, chainId: number, signer?: Wallet | JsonRpcSigner, authArgs?: AuthArgs);
     getOk(): Promise<any>;
     getRelayAddress(): Promise<AddressPayload>;
     getNonce(signerAddress: string, signerType: string): Promise<NoncePayload>;
@@ -16,6 +15,6 @@ export declare class RelayClient {
     executeProxyTransactions(txns: ProxyTransaction[]): Promise<any>;
     executeSafeTransactions(txns: SafeTransaction[]): Promise<any>;
     deploySafe(): Promise<any>;
-    initializeWsConnection(transactionId?: string): Promise<void>;
-    private sendTransactionRequest;
+    private postTransactionRequest;
+    private send;
 }

package/dist/client.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelayClient = void 0;
 const tslib_1 = require("tslib");
 const ethers_1 = require("ethers");
-const ws_1 = require("ws");
 const http_helpers_1 = require("./http-helpers");
 const types_1 = require("./types");
 const endpoints_1 = require("./endpoints");
@@ -12,43 +11,42 @@ const encode_1 = require("./encode");
 const create_1 = require("./builder/create");
 const auth_1 = require("./auth");
 class RelayClient {
-    constructor(relayerUrl, chainId, authArgs, signer, wsRelayerUrl) {
+    constructor(relayerUrl, chainId, signer, authArgs) {
         this.relayerUrl = relayerUrl.endsWith("/") ? relayerUrl.slice(0, -1) : relayerUrl;
         this.chainId = chainId;
-        this.authHandler = new auth_1.AuthHandler(authArgs);
         if (signer !== undefined) {
             this.signer = signer;
             if (signer.provider == undefined) {
                 throw new Error("signer must have provider attached");
             }
         }
-        if (wsRelayerUrl !== undefined) {
-            this.wsRelayerUrl = wsRelayerUrl;
+        if (authArgs !== undefined) {
+            this.authHandler = new auth_1.AuthHandler(authArgs);
         }
     }
     getOk() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return http_helpers_1.get(`${this.relayerUrl}/`);
+            return this.send(`${this.relayerUrl}/`, http_helpers_1.GET);
         });
     }
     getRelayAddress() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return http_helpers_1.get(`${this.relayerUrl}${endpoints_1.GET_ADDRESS}`, { headers: yield this.authHandler.getAuthHeader() });
+            return this.send(`${this.relayerUrl}${endpoints_1.GET_ADDRESS}`, http_helpers_1.GET);
         });
     }
     getNonce(signerAddress, signerType) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return http_helpers_1.get(`${this.relayerUrl}${endpoints_1.GET_NONCE}?address=${signerAddress}&type=${signerType}`, { headers: yield this.authHandler.getAuthHeader() });
+            return this.send(`${this.relayerUrl}${endpoints_1.GET_NONCE}?address=${signerAddress}&type=${signerType}`, http_helpers_1.GET);
         });
     }
     getRelayPayload(signerAddress, signerType) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return http_helpers_1.get(`${this.relayerUrl}${endpoints_1.GET_RELAY_PAYLOAD}?address=${signerAddress}&type=${signerType}`, { headers: yield this.authHandler.getAuthHeader() });
+            return this.send(`${this.relayerUrl}${endpoints_1.GET_RELAY_PAYLOAD}?address=${signerAddress}&type=${signerType}`, http_helpers_1.GET);
         });
     }
     getTransaction(transactionId) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return http_helpers_1.get(`${this.relayerUrl}${endpoints_1.GET_TRANSACTION}?id=${transactionId}`, { headers: yield this.authHandler.getAuthHeader() });
+            return this.send(`${this.relayerUrl}${endpoints_1.GET_TRANSACTION}?id=${transactionId}`, http_helpers_1.GET);
         });
     }
     executeProxyTransactions(txns) {
@@ -68,7 +66,7 @@ class RelayClient {
             };
             const request = yield builder_1.buildProxyTransactionRequest(this.signer, args);
             console.log(`Client side request creation took: ${(Date.now() - start) / 1000} seconds`);
-            return this.sendTransactionRequest(request);
+            return this.postTransactionRequest(request);
         });
     }
     executeSafeTransactions(txns) {
@@ -88,7 +86,7 @@ class RelayClient {
             };
             const request = yield builder_1.buildSafeTransactionRequest(this.signer, args);
             console.log(`Client side request creation took: ${(Date.now() - start) / 1000} seconds`);
-            return this.sendTransactionRequest(request);
+            return this.postTransactionRequest(request);
         });
     }
     deploySafe() {
@@ -108,51 +106,32 @@ class RelayClient {
             };
             const request = yield create_1.buildSafeCreateTransactionRequest(this.signer, args);
             console.log(`Client side request creation took: ${(Date.now() - start) / 1000} seconds`);
-            return this.sendTransactionRequest(request);
+            return this.postTransactionRequest(request);
         });
     }
-    initializeWsConnection(transactionId) {
+    postTransactionRequest(req) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.signer == undefined) {
-                throw new Error("missing signer");
-            }
-            if (this.wsRelayerUrl == undefined) {
-                throw new Error("missing websocket url");
-            }
-            const from = yield this.signer.getAddress();
-            const txns = [];
-            if (transactionId !== undefined) {
-                txns.push(transactionId);
-            }
-            const authCookies = yield this.authHandler.getPolymarketCookies();
-            const req = {
-                address: from,
-                transactions: txns,
-                cookies: authCookies,
-            };
-            const ws = new ws_1.WebSocket(`${this.wsRelayerUrl}${endpoints_1.WS_CONNECTION}`);
-            ws.on("open", function () {
-                ws.send(JSON.stringify(req));
-                setInterval(() => {
-                    ws.send("PING");
-                }, 5000);
-            });
-            ws.onmessage = function (msg) {
-                console.log(`Received ws message:`);
-                console.log(msg.data);
-            };
-            ws.on("close", function (e) {
-                console.log("WS Connection closed, reason: " + e);
-                return;
-            });
+            return this.send(`${this.relayerUrl}${endpoints_1.SUBMIT_TRANSACTION}`, http_helpers_1.POST, undefined, req);
         });
     }
-    sendTransactionRequest(req) {
+    send(endpoint, method, headers, data, params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return http_helpers_1.post(`${this.relayerUrl}${endpoints_1.SUBMIT_TRANSACTION}`, {
-                data: req,
-                headers: yield this.authHandler.getAuthHeader()
-            });
+            // If client is instantiated locally/not on the browser, inject authorization cookies
+            // this is to ensure examples still run locally
+            if (this.authHandler != undefined) {
+                const cookie = yield this.authHandler.getPolymarketCookies();
+                if (headers != undefined) {
+                    headers["Cookie"] = cookie;
+                }
+                else {
+                    headers = { "Cookie": cookie };
+                }
+                const resp = yield http_helpers_1.request(endpoint, method, headers, data, params);
+                return resp.data;
+            }
+            // If the client is instantiated on the browser, do not inject cookies
+            const resp = yield http_helpers_1.request(endpoint, method, headers, data, params);
+            return resp.data;
         });
     }
 }

package/dist/endpoints.d.ts

@@ -3,4 +3,3 @@ export declare const GET_NONCE = "/nonce";
 export declare const GET_RELAY_PAYLOAD = "/relay-payload";
 export declare const GET_TRANSACTION = "/transaction";
 export declare const SUBMIT_TRANSACTION = "/submit";
-export declare const WS_CONNECTION = "/ws";

package/dist/endpoints.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WS_CONNECTION = exports.SUBMIT_TRANSACTION = exports.GET_TRANSACTION = exports.GET_RELAY_PAYLOAD = exports.GET_NONCE = exports.GET_ADDRESS = void 0;
+exports.SUBMIT_TRANSACTION = exports.GET_TRANSACTION = exports.GET_RELAY_PAYLOAD = exports.GET_NONCE = exports.GET_ADDRESS = void 0;
 exports.GET_ADDRESS = "/address";
 exports.GET_NONCE = "/nonce";
 exports.GET_RELAY_PAYLOAD = "/relay-payload";
 exports.GET_TRANSACTION = "/transaction";
 exports.SUBMIT_TRANSACTION = "/submit";
-exports.WS_CONNECTION = "/ws";

package/dist/http-helpers/index.js

@@ -7,28 +7,39 @@ exports.GET = "GET";
 exports.POST = "POST";
 exports.DELETE = "DELETE";
 exports.PUT = "PUT";
+axios_1.default.defaults.withCredentials = true;
 exports.request = (endpoint, method, headers, data, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     try {
-        const response = yield axios_1.default({ method, url: endpoint, headers, data, params });
-        return response;
+        const resp = yield axios_1.default({
+            withCredentials: true,
+            method,
+            url: endpoint,
+            headers,
+            data,
+            params
+        });
+        return resp;
     }
     catch (err) {
         if (axios_1.default.isAxiosError(err)) {
             if (err.response) {
-                console.error("request error", {
+                const errPayload = {
                     error: "request error",
                     status: (_a = err.response) === null || _a === void 0 ? void 0 : _a.status,
                     statusText: (_b = err.response) === null || _b === void 0 ? void 0 : _b.statusText,
                     data: (_c = err.response) === null || _c === void 0 ? void 0 : _c.data,
-                });
-                return (_d = err.response) === null || _d === void 0 ? void 0 : _d.data;
+                };
+                console.error("request error", errPayload);
+                throw new Error(JSON.stringify(errPayload));
             }
             else {
-                return { error: "connection error" };
+                const errPayload = { error: "connection error" };
+                console.error("connection error", errPayload);
+                throw new Error(JSON.stringify(errPayload));
             }
         }
-        return { error: err };
+        throw new Error(JSON.stringify({ error: err }));
     }
 });
 exports.post = (endpoint, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@polymarket/relayer-client",
     "description": "Client for Polymarket relayers",
-    "version": "0.0.2",
+    "version": "0.0.4",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "files": [