@xandeum/web3.js 0.8.0 → 0.8.1

package/dist/getXandeumResult.js

@@ -55,40 +55,60 @@ function sleep(ms) {
  */
 function getXandeumResult(connection, signature) {
     return __awaiter(this, void 0, void 0, function () {
-        var url, requestBody, response, errorText, data;
+        var url, maxAttempts, delayMs, attempt, response, text, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     url = connection.rpcEndpoint;
-                    requestBody = {
-                        jsonrpc: '2.0',
-                        id: 1,
-                        method: 'getXandeumResult',
-                        params: [signature]
-                    };
-                    // sleeping To let the transaction process
-                    return [4 /*yield*/, sleep(5000)];
+                    maxAttempts = 3;
+                    delayMs = 5000;
+                    attempt = 1;
+                    _a.label = 1;
                 case 1:
-                    // sleeping To let the transaction process
+                    if (!(attempt <= maxAttempts)) return [3 /*break*/, 8];
+                    // Wait before every attempt (including the first one)
+                    return [4 /*yield*/, sleep(delayMs)];
+                case 2:
+                    // Wait before every attempt (including the first one)
                     _a.sent();
                     return [4 /*yield*/, fetch(url, {
-                            method: 'POST',
-                            headers: {
-                                'Content-Type': 'application/json'
-                            },
-                            body: JSON.stringify(requestBody)
+                            method: "POST",
+                            headers: { "Content-Type": "application/json" },
+                            body: JSON.stringify({
+                                jsonrpc: "2.0",
+                                id: 1,
+                                method: "getXandeumResult",
+                                params: [signature],
+                            }),
                         })];
-                case 2:
+                case 3:
                     response = _a.sent();
-                    if (!!response.ok) return [3 /*break*/, 4];
+                    if (!!response.ok) return [3 /*break*/, 5];
                     return [4 /*yield*/, response.text()];
-                case 3:
-                    errorText = _a.sent();
-                    return [2 /*return*/, new Error("Error! status: ".concat(response.status, ", message: ").concat(errorText))];
-                case 4: return [4 /*yield*/, response.json()];
-                case 5:
+                case 4:
+                    text = _a.sent();
+                    console.error("Attempt ".concat(attempt, "/").concat(maxAttempts, " failed: ").concat(response.status, " ").concat(text));
+                    if (attempt === maxAttempts) {
+                        return [2 /*return*/, { result: null, error: "HTTP ".concat(response.status) }];
+                    }
+                    return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, response.json()];
+                case 6:
                     data = _a.sent();
-                    return [2 /*return*/, data];
+                    // Change this condition if Xandeum uses a different "not ready" value
+                    if ((data === null || data === void 0 ? void 0 : data.result) != null && data.result !== "pending") {
+                        console.log("Got result on attempt ".concat(attempt));
+                        return [2 /*return*/, data]; // Success — return immediately
+                    }
+                    console.log("Attempt ".concat(attempt, "/").concat(maxAttempts, ": still pending..."));
+                    _a.label = 7;
+                case 7:
+                    attempt++;
+                    return [3 /*break*/, 1];
+                case 8:
+                    // All 3 attempts done, still no result
+                    console.log("Max attempts reached — result still not available");
+                    return [2 /*return*/, { result: null, error: "Result not ready after 3 attempts" }];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xandeum/web3.js",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Xandeum javascript api",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/getXandeumResult.ts

@@ -18,31 +18,50 @@ function sleep(ms: number) {
  * @returns A `Promise<any>` resolving to the parsed JSON response from the RPC server,
  *          which includes the result of the transaction if available.
  */
-export async function getXandeumResult(  connection: Connection, signature: string): Promise<any> {
+export async function getXandeumResult(
+    connection: Connection,
+    signature: string
+  ): Promise<any> {
     const url = connection.rpcEndpoint;
-    const requestBody = {
-        jsonrpc: '2.0',
-        id: 1,
-        method: 'getXandeumResult',
-        params: [signature]
+    const maxAttempts = 3;
+    const delayMs = 5000;
+  
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      // Wait before every attempt (including the first one)
+      await sleep(delayMs);
+  
+      const response = await fetch(url, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          jsonrpc: "2.0",
+          id: 1,
+          method: "getXandeumResult",
+          params: [signature],
+        }),
+      });
+  
+      if (!response.ok) {
+        const text = await response.text();
+        console.error(`Attempt ${attempt}/${maxAttempts} failed: ${response.status} ${text}`);
+        if (attempt === maxAttempts) {
+          return { result: null, error: `HTTP ${response.status}` };
+        }
+        continue;
+      }
+  
+      const data = await response.json();
+  
+      // Change this condition if Xandeum uses a different "not ready" value
+      if (data?.result != null && data.result !== "pending") {
+        console.log(`Got result on attempt ${attempt}`);
+        return data; // Success — return immediately
+      }
+  
+      console.log(`Attempt ${attempt}/${maxAttempts}: still pending...`);
     }
-
-    // sleeping To let the transaction process
-    await sleep(5000);
-
-    const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(requestBody)
-    })
-
-    if (!response.ok) {
-        const errorText = await response.text();
-        return new Error(`Error! status: ${response.status}, message: ${errorText}`);
-    }
-
-    const data = await response.json()
-    return data
-}
+  
+    // All 3 attempts done, still no result
+    console.log("Max attempts reached — result still not available");
+    return { result: null, error: "Result not ready after 3 attempts" };
+  }