Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Coder
code-server
提交
8d03c22c
C
code-server
项目概览
镜像
/
Coder
/
code-server
2022-09-21 03:15:05同步失败
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
code-server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8d03c22c
编写于
8月 10, 2020
作者:
G
G r e y
提交者:
GitHub
8月 10, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1956 from cdr/plural
Update common/util::plural
上级
c78d1649
6e27869c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
3 deletion
+8
-3
src/common/util.ts
src/common/util.ts
+5
-1
src/node/entry.ts
src/node/entry.ts
+2
-1
src/node/http.ts
src/node/http.ts
+1
-1
未找到文件。
src/common/util.ts
浏览文件 @
8d03c22c
...
@@ -16,7 +16,11 @@ export const split = (str: string, delimiter: string): [string, string] => {
...
@@ -16,7 +16,11 @@ export const split = (str: string, delimiter: string): [string, string] => {
return
index
!==
-
1
?
[
str
.
substring
(
0
,
index
).
trim
(),
str
.
substring
(
index
+
1
)]
:
[
str
,
""
]
return
index
!==
-
1
?
[
str
.
substring
(
0
,
index
).
trim
(),
str
.
substring
(
index
+
1
)]
:
[
str
,
""
]
}
}
export
const
plural
=
(
count
:
number
):
string
=>
(
count
===
1
?
""
:
"
s
"
)
/**
* Appends an 's' to the provided string if count is greater than one;
* otherwise the string is returned
*/
export
const
plural
=
(
count
:
number
,
str
:
string
):
string
=>
(
count
===
1
?
str
:
`
${
str
}
s`
)
export
const
generateUuid
=
(
length
=
24
):
string
=>
{
export
const
generateUuid
=
(
length
=
24
):
string
=>
{
const
possible
=
"
0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
"
const
possible
=
"
0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
"
...
...
src/node/entry.ts
浏览文件 @
8d03c22c
...
@@ -11,6 +11,7 @@ import { Args, bindAddrFromAllSources, optionDescriptions, parse, readConfigFile
...
@@ -11,6 +11,7 @@ import { Args, bindAddrFromAllSources, optionDescriptions, parse, readConfigFile
import
{
AuthType
,
HttpServer
,
HttpServerOptions
}
from
"
./http
"
import
{
AuthType
,
HttpServer
,
HttpServerOptions
}
from
"
./http
"
import
{
generateCertificate
,
hash
,
open
,
humanPath
}
from
"
./util
"
import
{
generateCertificate
,
hash
,
open
,
humanPath
}
from
"
./util
"
import
{
ipcMain
,
wrap
}
from
"
./wrapper
"
import
{
ipcMain
,
wrap
}
from
"
./wrapper
"
import
{
plural
}
from
"
../common/util
"
process
.
on
(
"
uncaughtException
"
,
(
error
)
=>
{
process
.
on
(
"
uncaughtException
"
,
(
error
)
=>
{
logger
.
error
(
`Uncaught exception:
${
error
.
message
}
`
)
logger
.
error
(
`Uncaught exception:
${
error
.
message
}
`
)
...
@@ -110,7 +111,7 @@ const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void>
...
@@ -110,7 +111,7 @@ const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void>
}
}
if
(
httpServer
.
proxyDomains
.
size
>
0
)
{
if
(
httpServer
.
proxyDomains
.
size
>
0
)
{
logger
.
info
(
` -
Proxying the following domain
${
httpServer
.
proxyDomains
.
size
===
1
?
""
:
"
s
"
}
:`
)
logger
.
info
(
` -
${
plural
(
httpServer
.
proxyDomains
.
size
,
"
Proxying the following domain
"
)
}
:`
)
httpServer
.
proxyDomains
.
forEach
((
domain
)
=>
logger
.
info
(
` - *.
${
domain
}
`
))
httpServer
.
proxyDomains
.
forEach
((
domain
)
=>
logger
.
info
(
` - *.
${
domain
}
`
))
}
}
...
...
src/node/http.ts
浏览文件 @
8d03c22c
...
@@ -481,7 +481,7 @@ export class HttpServer {
...
@@ -481,7 +481,7 @@ export class HttpServer {
this
.
proxyDomains
=
new
Set
((
options
.
proxyDomains
||
[]).
map
((
d
)
=>
d
.
replace
(
/^
\*\.
/
,
""
)))
this
.
proxyDomains
=
new
Set
((
options
.
proxyDomains
||
[]).
map
((
d
)
=>
d
.
replace
(
/^
\*\.
/
,
""
)))
this
.
heart
=
new
Heart
(
path
.
join
(
paths
.
data
,
"
heartbeat
"
),
async
()
=>
{
this
.
heart
=
new
Heart
(
path
.
join
(
paths
.
data
,
"
heartbeat
"
),
async
()
=>
{
const
connections
=
await
this
.
getConnections
()
const
connections
=
await
this
.
getConnections
()
logger
.
trace
(
`
${
connections
}
active connection
${
plural
(
connections
)}
`
)
logger
.
trace
(
plural
(
connections
,
`
${
connections
}
active connection`
)
)
return
connections
!==
0
return
connections
!==
0
})
})
this
.
protocol
=
this
.
options
.
cert
?
"
https
"
:
"
http
"
this
.
protocol
=
this
.
options
.
cert
?
"
https
"
:
"
http
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录