fix: get params (#12)

* fix: get params * fix: json
Easypanel-Community · Nov 27, 2023 · ea07d51 · ea07d51
1 parent d82f2a8
commit ea07d51
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 21 deletions.
diff --git a/playground/index.ts b/playground/index.ts
@@ -8,5 +8,10 @@ const app = easypanel({
   token: process.env.EASYPANEL_TOKEN || '',
 })
 
-const dd = await app.projects.create({ name: 'ttt' })
-console.warn(dd)
+// const dd = await app.projects.create({ name: 'ttt' })
+// console.warn(dd)
+
+const response = await app.projects.inspect({
+  projectName: 'projects',
+})
+console.warn(response)
diff --git a/src/client.ts b/src/client.ts
@@ -18,13 +18,13 @@ function client(config: ClientConfig): ClientResponse {
     retryDelay: 1000, // ms
   })
 
-  function get<T>(route: string, body: any): Promise<T> {
+  function get<T>(route: string, input?: any): Promise<T> {
     return customClient(route, {
       method: 'GET',
       headers: {
         Authorization: token,
       },
-      body: JSON.stringify(body),
+      params: input,
     })
   }
 

diff --git a/src/service/monitors.ts b/src/service/monitors.ts
@@ -10,28 +10,36 @@ import { routes } from '../utils/routes'
 export function monitor({ get }: ClientResponse) {
   async function getAdvancedStats() {
     const res = await get<AdvancedStats>(routes.monitor.GetAdvancedStats, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
 
   async function getDockerTaskStats() {
     const res = await get<DockerTaskStats>(routes.monitor.GetDockerTaskStats, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
 
   async function getMonitorTableData() {
     const res = await get<ContainerStats>(routes.monitor.GetMonitorTableData, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
 
   async function getSystemStats() {
     const res = await get<SystemStats>(routes.monitor.GetSystemStats, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }

diff --git a/src/service/projects.ts b/src/service/projects.ts
@@ -15,7 +15,9 @@ import type {
 export function projects({ get, post }: ClientResponse) {
   async function canCreate() {
     const res = await get<CanCreate>(routes.projets.CanCreate, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
@@ -37,21 +39,27 @@ export function projects({ get, post }: ClientResponse) {
 
   async function inspect(body: ProjectQueryConf) {
     const res = await get<Project>(routes.projets.Inspect, {
-      json: body,
+      input: {
+        json: body,
+      },
     })
     return res
   }
 
   async function list() {
     const res = await get<ListProjects>(routes.projets.List, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
 
   async function listWithServices() {
     const res = await get<ListWithServices>(routes.projets.ListWithServices, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }

diff --git a/src/service/services.ts b/src/service/services.ts
@@ -44,7 +44,11 @@ export function services({ get, post }: ClientResponse) {
     body: SelectService,
   ) {
     const Route = routes.services(serviceType).Inspect
-    const res = await get<ServiceRes>(Route, { json: body })
+    const res = await get<ServiceRes>(Route, { input: {
+      input: {
+        json: body,
+      },
+    } })
     return res
   }
 
@@ -256,8 +260,10 @@ export function services({ get, post }: ClientResponse) {
     const service = `${body.projectName}_${body.serviceName}`
     const res = await get<StringResponse>(routes.services('').GetServiceLogs, {
       json: {
-        service,
-        lines: 50,
+        input: {
+          service,
+          lines: 50,
+        },
       },
     })
 

diff --git a/src/service/settings.ts b/src/service/settings.ts
@@ -26,7 +26,9 @@ export function settings({ get, post }: ClientResponse) {
    */
   async function getGithubToken(): Promise<StringResponse> {
     const res = await get<StringResponse>(routes.settings.GetGithubToken, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
@@ -37,21 +39,29 @@ export function settings({ get, post }: ClientResponse) {
   async function getLetsEncryptEmail(): Promise<StringResponse> {
     const res = await get<StringResponse>(
       routes.settings.GetLetsEncryptEmail,
-      { json: null },
+      {
+        input: {
+          json: null,
+        },
+      },
     )
     return res
   }
 
   async function getPanelDomain(): Promise<PanelDomainRes> {
     const res = await get<PanelDomainRes>(routes.settings.GetPanelDomain, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
 
   async function getServerIp(): Promise<StringResponse> {
     const res = await get<StringResponse>(routes.settings.GetServerIp, {
-      json: null,
+      input: {
+        json: null,
+      },
     })
     return res
   }
@@ -60,7 +70,9 @@ export function settings({ get, post }: ClientResponse) {
     const res = await get<StringResponse>(
       routes.settings.GetTraefikCustomConfig,
       {
-        json: null,
+        input: {
+          json: null,
+        },
       },
     )
     return res

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,5 +1,5 @@
 export interface ClientResponse {
-  get: <T>(route: string, body: any) => Promise<T>
+  get: <T>(route: string, input?: any) => Promise<T>
   post: <T>(route: string, body: any) => Promise<T>
   token: string
 }