dmsg socks5 proxy (#236)

* add dmsg-socks5
skycoin · Feb 24, 2024 · 22e2bc0 · 22e2bc0
1 parent 5632510
commit 22e2bc0
Show file tree

Hide file tree

Showing 7 changed files with 447 additions and 211 deletions.
diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml
@@ -2,9 +2,6 @@
 # Make sure to check the documentation at http://goreleaser.com
 
 release:
-  # Repo in which the release will be created.
-  # Default is extracted from the origin remote URL or empty if its private hosted.
-  # Note: it can only be one: either github or gitlab or gitea
   github:
     owner: skycoin
     name: dmsg
@@ -15,30 +12,13 @@ before:
   hooks:
     - go mod tidy
 
-builds:
-  - id: dmsg-discovery
-    binary: dmsg-discovery
-    goos:
-      - darwin
-    goarch:
-      - arm64
-      - amd64
-    env:
-      - CGO_ENABLED=1
-    main: ./cmd/dmsg-discovery/
-    ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+env:
+  - CGO_ENABLED=0
 
-  - id: dmsg-server
-    binary: dmsg-server
-    goos:
-      - darwin
-    goarch:
-      - arm64
-      - amd64
-    env:
-      - CGO_ENABLED=0
-    main: ./cmd/dmsg-server/
-    ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+common_flags: >
+  -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}}
+  -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}}
+  -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
   - id: dmsgcurl
     binary: dmsgcurl
@@ -52,41 +32,47 @@ builds:
     main: ./cmd/dmsgcurl/
     ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
-  - id: dmsgpty-ui
-    binary: dmsgpty-ui
-    goos:
-      - darwin
-    goarch:
-      - arm64
-      - amd64
-    env:
-      - CGO_ENABLED=0
-    main: ./cmd/dmsgpty-ui/
-    ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+targets:
+  - name: dmsg-discovery
+    id: discovery
+    arch: arm64
 
-  - id: dmsgpty-host
-    binary: dmsgpty-host
-    goos:
-      - darwin
-    goarch:
-      - arm64
-      - amd64
-    env:
-      - CGO_ENABLED=0
-    main: ./cmd/dmsgpty-host/
-    ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+  - name: dmsg-server
+    id: server
+    arch: arm64
 
-  - id: dmsgpty-cli
-    binary: dmsgpty-cli
-    goos:
-      - darwin
+  - name: dmsgget
+    id: get
+    arch: arm64
+
+  - name: dmsgpost
+    id: post
+    arch: arm64
+
+  - name: dmsghttp
+    id: http
+    arch: arm64
+
+  - name: dmsgpty-ui
+    id: ui
+    arch: arm64
+
+  - name: dmsgpty-cli
+    id: cli
+    arch: arm64
+
+  - name: dmsgpty-host
+    id: host
+    arch: arm64
+
+builds: &builds
+  {{ range .Targets }}
+  - id: {{ .id }}-{{ .arch }}
+    binary: {{ .name }}
     goarch:
-      - arm64
-      - amd64
-    env:
-      - CGO_ENABLED=0
-    main: ./cmd/dmsgpty-cli/
-    ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+      - {{ .arch }}
+    <<: *common_build
+  {{ end }}
 
   - id: dmsgweb
     binary: dmsgweb
@@ -116,9 +102,11 @@ archives:
     allow_different_binary_count: true
 
 checksum:
-  name_template: 'checksums.txt'  
+  name_template: 'checksums.txt'
+
 snapshot:
   name_template: "{{ .Tag }}-next"
+
 changelog:
   sort: asc
   filters:

diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml
@@ -1,125 +1,56 @@
 # This is an example goreleaser.yaml file with some sane defaults.
 # Make sure to check the documentation at http://goreleaser.com
-
 release:
-  # Repo in which the release will be created.
-  # Default is extracted from the origin remote URL or empty if its private hosted.
-  # Note: it can only be one: either github or gitlab or gitea
   github:
     owner: skycoin
     name: dmsg
 
-  prerelease: true
+  prerelease: false
 
 before:
   hooks:
     - go mod tidy
 
-builds:
+env:
+  - CGO_ENABLED=1
+  - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc
 
-  - id: dmsg-discovery-amd64
-    binary: dmsg-discovery
-    goos:
-      - linux
-    goarch:
-      - amd64
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc
-    main: ./cmd/dmsg-discovery/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+common_flags: >
+  -s -w -linkmode external -extldflags '-static' -buildid=
+  -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}}
+  -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}}
+  -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
-  - id: dmsg-discovery-arm64
-    binary: dmsg-discovery
-    goos:
-      - linux
-    goarch:
-      - arm64
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
-    main: ./cmd/dmsg-discovery/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+common_build: &common_build
+  goos:
+    - linux
+  main: ./cmd/{{ .name }}/
+  ldflags: *common_flags
 
-  - id: dmsg-discovery-arm
-    binary: dmsg-discovery
-    goos:
-      - linux
-    goarch:
-      - arm
-    goarm:
-      - 6
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc
-    main: ./cmd/dmsg-discovery/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+targets:
+  - name: dmsg-discovery
+    id: discovery
+    arch: amd64
 
-  - id: dmsg-discovery-armhf
-    binary: dmsg-discovery
-    goos:
-      - linux
-    goarch:
-      - arm
-    goarm:
-      - 7
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc
-    main: ./cmd/dmsg-discovery/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+  - name: dmsg-server
+    id: server
+    arch: amd64
 
-  - id: dmsg-server-amd64
-    binary: dmsg-server
-    goos:
-      - linux
-    goarch:
-      - amd64
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc
-    main: ./cmd/dmsg-server/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+  - name: dmsgpty-ui
+    id: ui
+    arch: amd64
 
-  - id: dmsg-server-arm64
-    binary: dmsg-server
-    goos:
-      - linux
-    goarch:
-      - arm64
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
-    main: ./cmd/dmsg-server/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+  - name: dmsgpty-cli
+    id: cli
+    arch: amd64
 
-  - id: dmsg-server-arm
-    binary: dmsg-server
-    goos:
-      - linux
-    goarch:
-      - arm
-    goarm:
-      - 6
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc
-    main: ./cmd/dmsg-server/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+  - name: dmsgget
+    id: get
+    arch: amd64
 
-  - id: dmsg-server-armhf
-    binary: dmsg-server
-    goos:
-      - linux
-    goarch:
-      - arm
-    goarm:
-      - 7
-    env:
-      - CGO_ENABLED=1
-      - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc
-    main: ./cmd/dmsg-server/
-    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
+  - name: dmsgpost
+    id: post
+    arch: amd64
 
   - id: dmsgcurl-amd64
     binary: dmsgcurl
@@ -436,8 +367,10 @@ archives:
 
 checksum:
   name_template: 'checksums.txt'
+
 snapshot:
   name_template: "{{ .Tag }}-next"
+
 changelog:
   sort: asc
   filters: