Thilawyn/protonmail-bridge-docker
1
0
Fork 0
forked from mirrors/protonmail-bridge-docker
Code Pull Requests Activity

Upgrade the bridge to 2.2.0

Browse Source
This commit is contained in:
Xiaonan Shen
2022-05-28 19:40:34 +08:00
parent 1c64b99201
commit 8101ecda38
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BRIDGE_VERSION
View File

@@ -1 +1 @@
v2.1.3
v2.2.0

4
Dockerfile
View File

@@ -17,9 +17,11 @@ LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
EXPOSE 25/tcp
EXPOSE 143/tcp
HEALTHCHECK --timeout=2s CMD nc -z 127.0.0.1 1025 && nc -z 127.0.0.1 1143
# Install dependencies and protonmail bridge
RUN apt-get update \
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates curl gosu \
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates curl gosu netcat \
&& rm -rf /var/lib/apt/lists/*
# Copy bash scripts

12
http_rest_frontend/cli/frontend.go
View File

@@ -112,8 +112,7 @@ func (f *frontendCLI) loginWithEnv() {
func (f *frontendCLI) watchEvents() {
errorCh := f.eventListener.ProvideChannel(events.ErrorEvent)
credentialsErrorCh := f.eventListener.ProvideChannel(events.CredentialsErrorEvent)
internetOffCh := f.eventListener.ProvideChannel(events.InternetOffEvent)
internetOnCh := f.eventListener.ProvideChannel(events.InternetOnEvent)
internetConnChangedCh := f.eventListener.ProvideChannel(events.InternetConnChangedEvent)
addressChangedCh := f.eventListener.ProvideChannel(events.AddressChangedEvent)
addressChangedLogoutCh := f.eventListener.ProvideChannel(events.AddressChangedLogoutEvent)
logoutCh := f.eventListener.ProvideChannel(events.LogoutEvent)
@@ -121,13 +120,16 @@ func (f *frontendCLI) watchEvents() {
for {
select {
case errorDetails := <-errorCh:
fmt.Println("Bridge failed:", errorDetails)
logrus.Error("Bridge failed:", errorDetails)
case <-credentialsErrorCh:
f.notifyCredentialsError()
case <-internetOffCh:
case stat := <-internetConnChangedCh:
if stat == events.InternetOff {
f.notifyInternetOff()
case <-internetOnCh:
}
if stat == events.InternetOn {
f.notifyInternetOn()
}
case address := <-addressChangedCh:
fmt.Printf("Address changed for %s. You may need to reconfigure your email client.", address)
case address := <-addressChangedLogoutCh: