Implement statusById in grid proxy client, update NODE_INFO_CACHE, apply changes in playground (#4437)

Author: zaelgohary

packages/gridproxy_client/src/modules/nodes.ts

@@ -1,4 +1,5 @@
 import { NodesBuilder, type NodesQuery } from "../builders/nodes";
+import { NodeStatus } from "../builders/public_api";
 import { resolvePaginator } from "../utils";
 import { AbstractClient } from "./abstract_client";
 import type { Farm, FarmsClient } from "./farms";
@@ -11,6 +12,10 @@ export interface NodesExtractOptions {
   loadStats?: boolean;
 }
 
+export interface NodeStatusInfo {
+  status: NodeStatus;
+}
+
 export class NodesClient extends AbstractClient<NodesBuilder, NodesQuery> {
   public farms: Map<number, Farm>;
   public twins: Map<number, Twin>;
@@ -89,6 +94,11 @@ export class NodesClient extends AbstractClient<NodesBuilder, NodesQuery> {
     return res.json();
   }
 
+  public async statusById(nodeId: number): Promise<NodeStatusInfo> {
+    const res = await this.builder({}).build(`/nodes/${nodeId}/status`);
+    return res.json();
+  }
+
   public async gpuById(nodeId: number): Promise<GPUCard[] | null | { error: string }> {
     const res = await this.builder({}).build(`/nodes/${nodeId}/gpu`);
     return res.json();

packages/playground/src/utils/contracts.ts

@@ -8,7 +8,7 @@ import { solutionType, type VDataTableHeader } from "@/types";
 import { normalizeBalance } from "./helpers";
 
 // Cache to store results of `getNodeInfo` requests
-const NODE_INFO_CACHE: { [key: number]: { status: NodeStatus; farmId: number } } = {};
+const NODE_INFO_CACHE: { [key: number]: { status: NodeStatus } } = {};
 
 export async function getUserContracts(grid: GridClient) {
   const res: any = await grid!.contracts.listMyContracts();
@@ -118,9 +118,9 @@ export async function getNodeInfo(nodeIDs: number[], requestedNodes: number[]) {
 
   const resultPromises = nodeIDsToRequest.map(async nodeId => {
     if (typeof nodeId !== "number") return {};
-    const nodeInfo = await gridProxyClient.nodes.byId(nodeId);
+    const nodeStatusInfo = await gridProxyClient.nodes.statusById(nodeId);
     // Store result in cache
-    NODE_INFO_CACHE[nodeId] = { status: nodeInfo.status, farmId: nodeInfo.farmId };
+    NODE_INFO_CACHE[nodeId] = { status: nodeStatusInfo.status };
     return { [nodeId]: NODE_INFO_CACHE[nodeId] };
   });
 

packages/playground/src/weblets/tf_contracts_list.vue

@@ -310,7 +310,7 @@ const password = ref("");
 const isValidForm = ref<boolean>(false);
 
 const panel = ref<number[]>([0, 1, 2]);
-const nodeInfo: Ref<{ [nodeId: number]: { status: NodeStatus; farmId: number } }> = ref({});
+const nodeInfo: Ref<{ [nodeId: number]: { status: NodeStatus } }> = ref({});
 const unlockContractLoading = ref<boolean>(false);
 const contractsTable = ref<(typeof ContractsTable)[]>([]);
 const loadingLockDetails = ref(false);