fix jsclient

Author: timzaak

.github/workflows/spa-server-ci.yml

@@ -59,10 +59,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run spa-server docker
         run: |
-          docker run -d \
-            -p 9000:9000 -p 8080:8080 \
-            --mount type=bind,source=${{ github.workspace }}/jsclient/test/config.toml,target=/config/config.toml \
-            ghcr.io/fornetcode/spa-server:latest
+          docker run -d -p 9000:9000 -p 8080:8080 -v $(PWD)/jsclient/test/config.toml:/config/config.toml ghcr.io/fornetcode/spa-server:2.4.0
       - uses: actions/setup-node@v4
         with:
           node-version: '20.x'

docs/develop/change-log.md

@@ -5,6 +5,7 @@
 - improve: bump deps version.
 - ci: jsclient can test auto.
 - feat: remove openTelemetry trace.
+- jsclient: change info response to pure json 
 
 ### Version 2.4.0
 

jsclient/src/command.ts

@@ -57,7 +57,7 @@ async function getClient(configPath: string | undefined) {
 }
 
 function writeResult(func: () => Promise<any>) {
-    func().then((v) => console.log(chalk.green(v))).catch((e) => {
+    func().then((v) => console.log(v)).catch((e) => {
         console.error(e)
         process.exit(-1)
     })
@@ -72,7 +72,7 @@ const info = command({
     handler: ({domain, config}) => {
         writeResult(async () => {
             const client = await getClient(config)
-            return await client.getDomainInfo(domain)
+            return JSON.stringify(await client.getDomainInfo(domain))
         })
     }
 })
@@ -117,7 +117,7 @@ const reload = command({
         writeResult(async () => {
             const client = await getClient(config)
             await client.reloadSPAServer()
-            return "reload successful"
+            return chalk.green("reload successful")
         })
     }
 })
@@ -132,7 +132,7 @@ const deleteCmd = command({
         writeResult(async () => {
             const client = await getClient(config)
             await client.removeFiles(domain, maxReserve)
-            return "delete successful"
+            return chalk.green("delete successful")
         })
     }
 })
@@ -147,7 +147,7 @@ const revokeVersionCmd = command({
         writeResult(async () => {
             const client = await getClient(config)
             await client.revokeVersion(domain, version)
-            return "revoke successful"
+            return chalk.green("revoke successful")
         })
     }
 })

jsclient/test/command.spec.ts

@@ -13,21 +13,16 @@ test('info', async () => {
 })
 
 test('upload', async () => {
-    const exampleProjectDir = path.resolve(__dirname, '../../example/js-app-example/build')
-    try {
-        const result = await runCommand(['upload', path.join(exampleProjectDir, 'build'), LOCAL_HOST])
-        console.log(result)
-    } catch (e) {
-        // expect error
-    }
+    const exampleProjectDir = path.resolve(__dirname, '../../example/js-app-example')
+
+    const result = await runCommand(['upload', path.join(exampleProjectDir, 'build'), LOCAL_HOST])
+    console.log(result)
+
 })
 test('release', async () => {
-    try {
-        const result = await runCommand(['release', LOCAL_HOST])
-        console.log(result)
-    } catch (e) {
-
-    }
+    const result = await runCommand(['release', LOCAL_HOST])
+    console.log(result)
+    expect(await runCommand(['info'])).toBe(`[{"domain":"${LOCAL_HOST}","current_version":1,"versions":[1]}]`)
 })
 
 

jsclient/test/config.toml

@@ -1,9 +1,10 @@
 file_dir = "./data"
-cors = []
+cors = true # would change
 [http]
 port = 8080
 addr = "0.0.0.0"
 
 [admin_config]
 port = 9000
-addr = "0.0.0.0"
+addr = "0.0.0.0"
+token = "token"

jsclient/test/practice.spec.ts

@@ -1,6 +1,7 @@
 //@ts-ignore
 import parse from '@pushcorn/hocon-parser'
 import walkdir from "walkdir";
+
 test("hocon-parser can load files ", async () => {
     const data = await parse({url: './test/example.conf'})
     expect(data).toStrictEqual({a:{b:2}})
@@ -9,7 +10,7 @@ test("hocon-parser can load files ", async () => {
 
 test("read directory", async () => {
 
-    const files = await walkdir.async('./test', {return_object: true})
+    const files = await walkdir.async('./test/practise', {return_object: true})
     Object.keys(files).forEach((path) => {
         const stat = files[path]
         if(stat.isFile()) {