added new operation status

Author: code-gio

src/services/monitor-analytic/index.ts

@@ -1,5 +1,7 @@
 import { apiCall } from "../core";
 import { HttpMethod } from "../core/types";
+import { getAndWaitForOperationStatusCompleted } from "../operation";
+import type { OperationStatus } from "../operation/types";
 
 /**
  * Get server bandwidth usage or disk size per application.
@@ -23,15 +25,20 @@ export function getServerSummary(
 /**
  * Get server usage.
  * @param {number} serverId Numeric id of the server.
- * @returns {Promise<{ status: boolean, operation_id: string }>} A promise resolving with the operation id.
+ * @returns {Promise<OperationStatus>} A promise resolving with the operation id.
  */
-export function getServerUsage(
+export async function getServerUsage(
   serverId: number
-): Promise<{ status: boolean; operation_id: string }> {
+): Promise<OperationStatus> {
   const data = {
     server_id: serverId,
   };
-  return apiCall("/server/analytics/serverUsage", HttpMethod.GET, data);
+  const req = await apiCall(
+    "/server/analytics/serverUsage",
+    HttpMethod.GET,
+    data
+  );
+  return await getAndWaitForOperationStatusCompleted(req.operation_id);
 }
 
 /**

src/services/operation/index.ts

@@ -1,22 +1,7 @@
+import { sleep } from "../../utils";
 import { apiCall } from "../core";
 import { HttpMethod } from "../core/types";
-
-// Define an interface for the operation status response
-interface OperationStatus {
-  id: string;
-  type: string;
-  server_id: string;
-  estimated_time_remaining: string;
-  frontend_step_number: string;
-  status: string;
-  is_completed: string;
-  message: string;
-  app_id: string;
-}
-
-interface GetOperationStatusResponse {
-  operation: OperationStatus;
-}
+import type { GetOperationStatusResponse, OperationStatus } from "./types";
 
 /**
  * Gets the status of an operation that is running in the background.
@@ -40,8 +25,22 @@ interface GetOperationStatusResponse {
  * }
  * ```
  */
-export function getOperationStatus(id: number): Promise<OperationStatus> {
+export function getOperationStatus(id: string): Promise<OperationStatus> {
   return apiCall(`/operation/${id}`, HttpMethod.GET).then(
     (response: GetOperationStatusResponse) => response.operation
   );
 }
+
+export async function getAndWaitForOperationStatusCompleted(
+  operationId: string
+) {
+  let operationStatus = await getOperationStatus(operationId);
+  while (operationStatus.is_completed !== "1") {
+    const waitTime = operationStatus.estimated_time_remaining
+      ? parseInt(operationStatus.estimated_time_remaining) * 60000
+      : 5000;
+    await sleep(waitTime);
+    operationStatus = await getOperationStatus(operationId);
+  }
+  return operationStatus;
+}

src/services/operation/types.ts

@@ -0,0 +1,17 @@
+// Define an interface for the operation status response
+export interface OperationStatus {
+  id: string;
+  type: string;
+  server_id: string;
+  estimated_time_remaining: string;
+  frontend_step_number: string;
+  status: string;
+  is_completed: string;
+  parameters?: string;
+  message: string;
+  app_id: string;
+}
+
+export interface GetOperationStatusResponse {
+  operation: OperationStatus;
+}

src/utils.ts

@@ -0,0 +1,2 @@
+export const sleep = (ms: number) =>
+  new Promise((resolve) => setTimeout(resolve, ms));