@@ -16,6 +16,7 @@ import {
16
16
} from "cmd-ts" ;
17
17
import { ExistingPath } from 'cmd-ts/batteries/fs' ;
18
18
import { version as Version } from '../package.json'
19
+ import chalk from "chalk" ;
19
20
20
21
export const Integer : Type < string , number > = extendType ( number , {
21
22
async from ( n ) {
@@ -38,25 +39,25 @@ const domain = positional({type: string, displayName: 'domain'})
38
39
const version = positional ( { type : Integer , displayName : 'version' } ) ;
39
40
const versionOptional = positional ( { type : optional ( Integer ) , displayName : 'version' } ) ;
40
41
41
- async function getClient ( configPath :string | undefined ) {
42
+ async function getClient ( configPath : string | undefined ) {
42
43
//load config
43
44
const hocon = configPath ? await parse ( { url : configPath } ) : { }
44
45
// address: string
45
46
// authToken: string
46
- const address : string | undefined = hocon ?. server ?. address ?? process . env . SPA_SERVER_ADDRESS
47
- const authToken : string | undefined = hocon ?. server ?. auth_token ?? process . env . SPA_SERVER_AUTH_TOKEN
47
+ const address : string | undefined = hocon ?. server ?. address ?? process . env . SPA_SERVER_ADDRESS
48
+ const authToken : string | undefined = hocon ?. server ?. auth_token ?? process . env . SPA_SERVER_AUTH_TOKEN
48
49
49
- if ( ! address ) {
50
+ if ( ! address ) {
50
51
return Promise . reject ( "server.address could not get" )
51
52
}
52
- if ( ! authToken ) {
53
+ if ( ! authToken ) {
53
54
return Promise . reject ( "server.auth_token could not get" )
54
55
}
55
56
return new SPAClient ( { address, authToken} )
56
57
}
57
58
58
- function writeResult ( func :( ) => Promise < any > ) {
59
- func ( ) . then ( ( v ) => console . log ( chalk . green ( v ) ) ) . catch ( ( e ) => {
59
+ function writeResult ( func : ( ) => Promise < any > ) {
60
+ func ( ) . then ( ( v ) => console . log ( chalk . green ( v ) ) ) . catch ( ( e ) => {
60
61
console . error ( e )
61
62
process . exit ( - 1 )
62
63
} )
@@ -81,15 +82,15 @@ const upload = command({
81
82
args : {
82
83
path : positional ( { type : ExistingPath , displayName : 'path' } ) ,
83
84
domain,
84
- version :versionOptional ,
85
+ version : versionOptional ,
85
86
parallel : option ( { type : optional ( Integer ) , short : 'p' , long : 'parallel' } ) ,
86
87
config : configDirOption ,
87
88
} ,
88
89
handler ( { path, domain, version, parallel, config} ) {
89
90
writeResult ( async ( ) => {
90
91
const client = await getClient ( config )
91
- const parallelParam = parallel ?? ( process . env . SPA_UPLOAD_PARALLEL ? Number ( process . env . SPA_UPLOAD_PARALLEL ) : undefined ) ?? 3
92
- await client . uploadFilesParallel ( domain , version , path , parallelParam )
92
+ const parallelParam = parallel ?? ( process . env . SPA_UPLOAD_PARALLEL ? Number ( process . env . SPA_UPLOAD_PARALLEL ) : undefined ) ?? 3
93
+ await client . uploadFilesParallel ( domain , version , path , parallelParam )
93
94
return "upload files finish"
94
95
} )
95
96
}
@@ -102,7 +103,7 @@ const release = command({
102
103
config : configDirOption ,
103
104
} ,
104
105
handler ( { domain, version, config} ) {
105
- writeResult ( async ( ) => {
106
+ writeResult ( async ( ) => {
106
107
const client = await getClient ( config )
107
108
return await client . releaseDomainVersion ( domain , version )
108
109
} )
@@ -113,7 +114,7 @@ const reload = command({
113
114
name : 'reload' ,
114
115
args : { config : configDirOption , } ,
115
116
handler ( { config} ) {
116
- writeResult ( async ( ) => {
117
+ writeResult ( async ( ) => {
117
118
const client = await getClient ( config )
118
119
await client . reloadSPAServer ( )
119
120
return "reload successful"
@@ -128,7 +129,7 @@ const deleteCmd = command({
128
129
config : configDirOption ,
129
130
} ,
130
131
handler ( { domain, maxReserve, config} ) {
131
- writeResult ( async ( ) => {
132
+ writeResult ( async ( ) => {
132
133
const client = await getClient ( config )
133
134
await client . removeFiles ( domain , maxReserve )
134
135
return "delete successful"
@@ -143,7 +144,7 @@ const revokeVersionCmd = command({
143
144
config : configDirOption
144
145
} ,
145
146
handler ( { domain, version, config} ) {
146
- writeResult ( async ( ) => {
147
+ writeResult ( async ( ) => {
147
148
const client = await getClient ( config )
148
149
await client . revokeVersion ( domain , version )
149
150
return "revoke successful"
0 commit comments