You've already forked img-proxy-url-generator
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2b865568c0
|
|||
|
05fc22e966
|
|||
|
6159a1509d
|
|||
|
e86c892b8f
|
|||
|
61f42c5297
|
|||
|
17971f34c1
|
|||
|
d66dbe89cb
|
|||
|
9af291f4d2
|
|||
|
3a61962c04
|
|||
|
7a8d0714f5
|
|||
|
bcd287b3b3
|
|||
|
2b1e5561a0
|
|||
|
6804c31a33
|
|||
|
d890bcbd2e
|
|||
|
|
dda3961e0e | ||
|
f6bc6231e5
|
|||
|
23629a40a8
|
|||
|
9dbd7ecab8
|
|||
|
48d7730a5c
|
|||
|
0aa8065640
|
|||
|
e3271ea47a
|
|||
|
85938a2def
|
|||
|
b93d1c29b8
|
|||
|
0ab36c5ea6
|
|||
|
4d2a7418cb
|
|||
|
1ad11d7e08
|
47
.gitea/workflows/build-grpc.yml
Normal file
47
.gitea/workflows/build-grpc.yml
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
on:
|
||||||
|
create:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
name: 🏗️✨ Build Workflow
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Build:
|
||||||
|
name: 🖥️ 🔨 Build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: 🛡️ 🔒 Add Siteworx CA Certificates
|
||||||
|
run: |
|
||||||
|
apt update && apt install -yq ca-certificates curl
|
||||||
|
curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt
|
||||||
|
update-ca-certificates
|
||||||
|
|
||||||
|
- name: 📖 🔍 Checkout Repository Code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 1
|
||||||
|
|
||||||
|
- name: 🔑 🔐 Login to Docker Hub
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
|
- name: 🏗️ 🔧 Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Replace entrypoint
|
||||||
|
run: |
|
||||||
|
sed -i 's/server/grpc/g' Dockerfile
|
||||||
|
sed -i 's/8080/9000/g' Dockerfile
|
||||||
|
|
||||||
|
- name: 🐳 🔨 Build Grpc Container
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
sbom: true
|
||||||
|
provenance: true
|
||||||
|
platforms: linux/arm64,linux/amd64
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: siteworxpro/img-proxy-url-generator:${{ gitea.ref_name }}-grpc
|
||||||
42
.gitea/workflows/build.yml
Normal file
42
.gitea/workflows/build.yml
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
on:
|
||||||
|
create:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
name: 🏗️✨ Build Workflow
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Build:
|
||||||
|
name: 🖥️ 🔨 Build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: 🛡️ 🔒 Add Siteworx CA Certificates
|
||||||
|
run: |
|
||||||
|
apt update && apt install -yq ca-certificates curl
|
||||||
|
curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt
|
||||||
|
update-ca-certificates
|
||||||
|
|
||||||
|
- name: 📖 🔍 Checkout Repository Code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 1
|
||||||
|
|
||||||
|
- name: 🔑 🔐 Login to Docker Hub
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
|
- name: 🏗️ 🔧 Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: 🐳 🔨 Build Server Container
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
sbom: true
|
||||||
|
provenance: true
|
||||||
|
platforms: linux/arm64,linux/amd64
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: siteworxpro/img-proxy-url-generator:${{ gitea.ref_name }}
|
||||||
39
.gitea/workflows/tests.yml
Normal file
39
.gitea/workflows/tests.yml
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- "*"
|
||||||
|
|
||||||
|
name: 🧪 ✨ Unit Tests Workflow
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test-go:
|
||||||
|
env:
|
||||||
|
GO_VERSION: '1.24.3'
|
||||||
|
name: 🔍 🐹 Go Tests
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
|
||||||
|
- name: 🛡️ 🔒 Add Siteworx CA Certificates
|
||||||
|
run: |
|
||||||
|
apt update && apt install -yq ca-certificates curl
|
||||||
|
curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt
|
||||||
|
update-ca-certificates
|
||||||
|
|
||||||
|
- name: ⚙️ 🐹 Set up Go Environment
|
||||||
|
uses: actions/setup-go@v2
|
||||||
|
with:
|
||||||
|
go-version: ${{ env.GO_VERSION }}
|
||||||
|
cache: true
|
||||||
|
|
||||||
|
- name: 📖 🔍 Checkout Repository Code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 1
|
||||||
|
|
||||||
|
- name: 📦 📥 Install Dependencies
|
||||||
|
run: |
|
||||||
|
go mod download
|
||||||
|
|
||||||
|
- name: ✅ 🔍 Run Go Tests
|
||||||
|
run: |
|
||||||
|
go test -v ./... -coverprofile=coverage.out
|
||||||
38
.github/ISSUE_TEMPLATE/bug_report.md
vendored
38
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -1,38 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is.
|
|
||||||
|
|
||||||
**To Reproduce**
|
|
||||||
Steps to reproduce the behavior:
|
|
||||||
1. Go to '...'
|
|
||||||
2. Click on '....'
|
|
||||||
3. Scroll down to '....'
|
|
||||||
4. See error
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
**Screenshots**
|
|
||||||
If applicable, add screenshots to help explain your problem.
|
|
||||||
|
|
||||||
**Desktop (please complete the following information):**
|
|
||||||
- OS: [e.g. iOS]
|
|
||||||
- Browser [e.g. chrome, safari]
|
|
||||||
- Version [e.g. 22]
|
|
||||||
|
|
||||||
**Smartphone (please complete the following information):**
|
|
||||||
- Device: [e.g. iPhone6]
|
|
||||||
- OS: [e.g. iOS8.1]
|
|
||||||
- Browser [e.g. stock browser, safari]
|
|
||||||
- Version [e.g. 22]
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
||||||
10
.github/ISSUE_TEMPLATE/custom.md
vendored
10
.github/ISSUE_TEMPLATE/custom.md
vendored
@@ -1,10 +0,0 @@
|
|||||||
---
|
|
||||||
name: Custom issue template
|
|
||||||
about: Describe this issue template's purpose here.
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
|
|
||||||
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Is your feature request related to a problem? Please describe.**
|
|
||||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
|
||||||
|
|
||||||
**Describe the solution you'd like**
|
|
||||||
A clear and concise description of what you want to happen.
|
|
||||||
|
|
||||||
**Describe alternatives you've considered**
|
|
||||||
A clear and concise description of any alternative solutions or features you've considered.
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context or screenshots about the feature request here.
|
|
||||||
6
.github/dependabot.yml
vendored
6
.github/dependabot.yml
vendored
@@ -1,6 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: gomod
|
|
||||||
directory: /
|
|
||||||
schedule:
|
|
||||||
interval: daily
|
|
||||||
27
.github/workflows/tests.yml
vendored
27
.github/workflows/tests.yml
vendored
@@ -1,27 +0,0 @@
|
|||||||
name: Go Tests
|
|
||||||
|
|
||||||
on: [push]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
go-version: [ '1.22.x' ]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Setup Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: ${{ matrix.go-version }}
|
|
||||||
- name: Install dependencies
|
|
||||||
run: go get .
|
|
||||||
- name: Test with Go
|
|
||||||
run: go test ./... -json -cover > TestResults-${{ matrix.go-version }}.json
|
|
||||||
- name: Upload Go test results
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: Go-results-${{ matrix.go-version }}
|
|
||||||
path: TestResults-${{ matrix.go-version }}.json
|
|
||||||
11
Dockerfile
11
Dockerfile
@@ -1,16 +1,16 @@
|
|||||||
FROM siteworxpro/golang:latest AS build
|
FROM siteworxpro/golang:1.24.3 AS build
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ADD . .
|
ADD . .
|
||||||
|
|
||||||
ENV GOPRIVATE=git.s.int
|
ENV GOPRIVATE=git.siteworxpro.com
|
||||||
ENV GOPROXY=direct
|
ENV GOPROXY=direct
|
||||||
ENV CGO_ENABLED=0
|
ENV CGO_ENABLED=0
|
||||||
|
|
||||||
RUN go mod tidy && go build -o imgproxy .
|
RUN go mod tidy && go build -o imgproxy .
|
||||||
|
|
||||||
FROM alpine AS runtime
|
FROM alpine:latest AS runtime
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
@@ -18,4 +18,9 @@ WORKDIR /app
|
|||||||
|
|
||||||
COPY --from=build /app/imgproxy /app/imgproxy
|
COPY --from=build /app/imgproxy /app/imgproxy
|
||||||
|
|
||||||
|
RUN adduser -u 1001 -g appuser appuser -D && \
|
||||||
|
chown -R appuser:appuser /app
|
||||||
|
|
||||||
|
USER 1001
|
||||||
|
|
||||||
ENTRYPOINT ["/app/imgproxy", "server"]
|
ENTRYPOINT ["/app/imgproxy", "server"]
|
||||||
22
README.md
22
README.md
@@ -35,6 +35,17 @@ plain-url=1
|
|||||||
|
|
||||||
## usage examples
|
## usage examples
|
||||||
|
|
||||||
|
### interactive
|
||||||
|
|
||||||
|
```shell
|
||||||
|
./imgproxy interactive
|
||||||
|
```
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
### command line
|
||||||
|
|
||||||
generate a plain url with an insecure signature
|
generate a plain url with an insecure signature
|
||||||
```ini
|
```ini
|
||||||
[img-proxy]
|
[img-proxy]
|
||||||
@@ -134,3 +145,14 @@ curl --location 'http://localhost:8080/generate' \
|
|||||||
}'
|
}'
|
||||||
```
|
```
|
||||||
`https://i.fooo.com/UMkz4OUNw6P9ShLdewuvW3ValMgCt263vZzU5gN57WQ/h:200/sm:1/enc/ECYxMeVBTjRxB7F-jdQ7W_-Fnv4YbmSJIKie-Hdtxd9vsmEKjU1YuWVSzdN97Mod.bmp`
|
`https://i.fooo.com/UMkz4OUNw6P9ShLdewuvW3ValMgCt263vZzU5gN57WQ/h:200/sm:1/enc/ECYxMeVBTjRxB7F-jdQ7W_-Fnv4YbmSJIKie-Hdtxd9vsmEKjU1YuWVSzdN97Mod.bmp`
|
||||||
|
|
||||||
|
|
||||||
|
## gRPC server
|
||||||
|
you can also serve request via a gRPC request
|
||||||
|
|
||||||
|
```shell
|
||||||
|
./imgproxy grpc
|
||||||
|
```
|
||||||
|
```
|
||||||
|
listening on :9000
|
||||||
|
```
|
||||||
7
Taskfile.yaml
Normal file
7
Taskfile.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
tasks:
|
||||||
|
proto-build:
|
||||||
|
cmds:
|
||||||
|
- protoc --go_out=grpc --proto_path=grpc --go_opt=paths=source_relative --php_out=grpc/php/src --go-grpc_out=grpc --go-grpc_opt=paths=source_relative $(find grpc -iname "*.proto")
|
||||||
|
silent: true
|
||||||
BIN
assets/interactive.gif
Normal file
BIN
assets/interactive.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 686 KiB |
@@ -6,30 +6,33 @@ import (
|
|||||||
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
|
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
|
||||||
"github.com/aws/aws-sdk-go/aws/session"
|
"github.com/aws/aws-sdk-go/aws/session"
|
||||||
"github.com/aws/aws-sdk-go/service/s3"
|
"github.com/aws/aws-sdk-go/service/s3"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Config struct {
|
|
||||||
AwsKey string
|
|
||||||
AwsSecret string
|
|
||||||
AwsRole string
|
|
||||||
Bucket string
|
|
||||||
}
|
|
||||||
|
|
||||||
type Service struct {
|
type Service struct {
|
||||||
s3 *s3.S3
|
s3 *s3.S3
|
||||||
bucket string
|
bucket string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewClient(config *Config) *Service {
|
func NewClient(config *config.Config) *Service {
|
||||||
|
|
||||||
|
var accessCredentials *credentials.Credentials
|
||||||
|
|
||||||
|
staticCredentials := credentials.NewStaticCredentials(config.Aws.AwsKey, config.Aws.AwsSecret, config.Aws.AwsToken)
|
||||||
awsSession := session.Must(session.NewSession(&aws.Config{
|
awsSession := session.Must(session.NewSession(&aws.Config{
|
||||||
Credentials: credentials.NewStaticCredentials(config.AwsKey, config.AwsSecret, ""),
|
Credentials: staticCredentials,
|
||||||
Region: aws.String("us-east-1"),
|
Region: aws.String("us-east-1"),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
assumeRoleCredentials := stscreds.NewCredentials(awsSession, config.AwsRole)
|
if config.Aws.AwsRole != "" {
|
||||||
|
assumeRoleCredentials := stscreds.NewCredentials(awsSession, config.Aws.AwsRole)
|
||||||
|
accessCredentials = assumeRoleCredentials
|
||||||
|
} else {
|
||||||
|
accessCredentials = staticCredentials
|
||||||
|
}
|
||||||
|
|
||||||
return &Service{
|
return &Service{
|
||||||
s3: s3.New(awsSession, &aws.Config{Credentials: assumeRoleCredentials}),
|
s3: s3.New(awsSession, &aws.Config{Credentials: accessCredentials}),
|
||||||
bucket: config.Bucket,
|
bucket: config.Aws.AwsBucket,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,10 @@ func (s *Service) ListBucketContents(continuationToken *string) (*BucketList, er
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, item := range v2.Contents {
|
for _, item := range v2.Contents {
|
||||||
|
if *item.Size == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
image := Image{
|
image := Image{
|
||||||
Name: *item.Key,
|
Name: *item.Key,
|
||||||
S3Path: "s3://" + s.bucket + "/" + *item.Key,
|
S3Path: "s3://" + s.bucket + "/" + *item.Key,
|
||||||
|
|||||||
2
build.sh
2
build.sh
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
go install
|
go mod tidy
|
||||||
|
|
||||||
for distro in $(go tool dist list)
|
for distro in $(go tool dist list)
|
||||||
do
|
do
|
||||||
|
|||||||
43
commands/decrypt.go
Normal file
43
commands/decrypt.go
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
package commands
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/printer"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func DecryptCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "decrypt",
|
||||||
|
Usage: "decrypt an image url contents",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "url",
|
||||||
|
Aliases: []string{"u"},
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
pr := printer.NewPrinter()
|
||||||
|
cfg, err := config.NewConfig(c.String("config"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
ig, err := generator.NewGenerator(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
plain, err := ig.Decrypt(c.String("url"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
pr.LogSuccess(plain)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
79
commands/generate.go
Normal file
79
commands/generate.go
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
package commands
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/printer"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func GenerateCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "generate",
|
||||||
|
Usage: "Generate an image from a URL",
|
||||||
|
Action: runGenerate,
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "image",
|
||||||
|
Aliases: []string{"i"},
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "format",
|
||||||
|
Aliases: []string{"f"},
|
||||||
|
Usage: "Convert the image to the specified format",
|
||||||
|
},
|
||||||
|
&cli.StringSliceFlag{
|
||||||
|
Name: "params",
|
||||||
|
Aliases: []string{"p"},
|
||||||
|
Usage: "Processing options to be passed to the generator ref: https://docs.imgproxy.net/usage/processing",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func runGenerate(c *cli.Context) error {
|
||||||
|
p := printer.NewPrinter()
|
||||||
|
|
||||||
|
_, err := config.NewConfig(c.String("config"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
url, err := signURL(c.String("image"), c.StringSlice("params"), c.String("format"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
p.LogInfo("Url Generated...")
|
||||||
|
|
||||||
|
println(url)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func signURL(file string, params []string, formatS string) (string, error) {
|
||||||
|
cfg := config.GetConfig()
|
||||||
|
if cfg == nil {
|
||||||
|
return "", fmt.Errorf("config not loaded")
|
||||||
|
}
|
||||||
|
|
||||||
|
ig, err := generator.NewGenerator(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
format, err := ig.StringToFormat(formatS)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
url, err := ig.GenerateUrl(file, params, format)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return url, nil
|
||||||
|
}
|
||||||
53
commands/grpc.go
Normal file
53
commands/grpc.go
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
package commands
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
proto "github.com/siteworxpro/img-proxy-url-generator/grpc"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
"google.golang.org/grpc"
|
||||||
|
"log"
|
||||||
|
"net"
|
||||||
|
)
|
||||||
|
|
||||||
|
func GrpcCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "grpc",
|
||||||
|
Usage: "Start a grpc service",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.IntFlag{
|
||||||
|
Name: "port",
|
||||||
|
Aliases: []string{"p"},
|
||||||
|
Usage: "Port to listen on",
|
||||||
|
Required: false,
|
||||||
|
Value: 9000,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
cfg, err := config.NewConfig(c.String("config"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
s := grpc.NewServer()
|
||||||
|
addr := fmt.Sprintf(":%d", c.Int("port"))
|
||||||
|
println("listening on", addr)
|
||||||
|
lis, err := net.Listen("tcp", addr)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("failed to listen: %v", err)
|
||||||
|
}
|
||||||
|
svc, err := proto.NewService(cfg)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("failed to serve: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
proto.RegisterGeneratorServer(s, svc)
|
||||||
|
err = s.Serve(lis)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("failed to serve: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
24
commands/interactive.go
Normal file
24
commands/interactive.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
package commands
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/interactive"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Interactive() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "interactive",
|
||||||
|
Usage: "Start an interactive session",
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
p := tea.NewProgram(interactive.InitialModel(c), tea.WithAltScreen())
|
||||||
|
|
||||||
|
if _, err := p.Run(); err != nil {
|
||||||
|
return fmt.Errorf("error running interactive session: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
22
commands/report.go
Normal file
22
commands/report.go
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
package commands
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/report"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ReportCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "report",
|
||||||
|
Usage: "Generate usage report",
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
cf, err := config.NewConfig(c.String("config"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return report.Handle(cf)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
124
commands/server.go
Normal file
124
commands/server.go
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
package commands
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/aws"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/printer"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
"html/template"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type jsonRequest struct {
|
||||||
|
Image string `json:"image"`
|
||||||
|
Params []string `json:"params"`
|
||||||
|
Format string `json:"format"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func ServerCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "server",
|
||||||
|
Usage: "Start a webserver for s3 file browsing and the web service",
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
p := printer.NewPrinter()
|
||||||
|
return startServer(c, p)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func startServer(c *cli.Context, p *printer.Printer) error {
|
||||||
|
cfg, err := config.NewConfig(c.String("config"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
ig, err := generator.NewGenerator(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = os.Stat("./templates")
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
awsClient := aws.NewClient(cfg)
|
||||||
|
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
_, _ = w.Write([]byte(err.Error()))
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
contToken := r.URL.Query().Get("next")
|
||||||
|
|
||||||
|
var next *string
|
||||||
|
if contToken == "" {
|
||||||
|
next = nil
|
||||||
|
} else {
|
||||||
|
next = &contToken
|
||||||
|
}
|
||||||
|
|
||||||
|
contents, err := awsClient.ListBucketContents(next)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
_, _ = w.Write([]byte(err.Error()))
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, content := range contents.Images {
|
||||||
|
contents.Images[i].Url, _ = ig.GenerateUrl("s3://"+cfg.Aws.AwsBucket+"/"+content.Name, []string{"pr:sq"}, "")
|
||||||
|
contents.Images[i].Download, _ = ig.GenerateUrl("s3://"+cfg.Aws.AwsBucket+"/"+content.Name, []string{""}, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
file, _ := os.ReadFile("./templates/index.gohtml")
|
||||||
|
|
||||||
|
tmpl := template.Must(template.New("index").Parse(string(file)))
|
||||||
|
|
||||||
|
err = tmpl.Execute(w, contents)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
http.HandleFunc("/generate", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != "POST" {
|
||||||
|
w.WriteHeader(404)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
bodyContents := make([]byte, r.ContentLength)
|
||||||
|
_, _ = r.Body.Read(bodyContents)
|
||||||
|
|
||||||
|
jr := jsonRequest{}
|
||||||
|
err = json.Unmarshal(bodyContents, &jr)
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
w.WriteHeader(500)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
url, err := signURL(jr.Image, jr.Params, jr.Format)
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
w.WriteHeader(500)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println(fmt.Sprintf("%s - [%s] - (%s)", jr.Image, strings.Join(jr.Params, ","), url))
|
||||||
|
|
||||||
|
_, _ = w.Write([]byte(url))
|
||||||
|
})
|
||||||
|
|
||||||
|
p.LogSuccess("Starting http server on port 8080. http://localhost:8080")
|
||||||
|
log.Fatal(http.ListenAndServe("0.0.0.0:8080", nil))
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
24
config/aws.go
Normal file
24
config/aws.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import "github.com/bigkevmcd/go-configparser"
|
||||||
|
|
||||||
|
type awsConfig struct {
|
||||||
|
AwsKey string
|
||||||
|
AwsSecret string
|
||||||
|
AwsToken string
|
||||||
|
AwsRegion string
|
||||||
|
AwsBucket string
|
||||||
|
AwsRole string
|
||||||
|
}
|
||||||
|
|
||||||
|
func getAwsConfig(p *configparser.ConfigParser) *awsConfig {
|
||||||
|
ac := &awsConfig{}
|
||||||
|
ac.AwsKey, _ = p.Get("aws", "key")
|
||||||
|
ac.AwsSecret, _ = p.Get("aws", "secret")
|
||||||
|
ac.AwsToken, _ = p.Get("aws", "token")
|
||||||
|
ac.AwsRegion, _ = p.Get("aws", "region")
|
||||||
|
ac.AwsBucket, _ = p.Get("aws", "bucket")
|
||||||
|
ac.AwsRole, _ = p.Get("aws", "role")
|
||||||
|
|
||||||
|
return ac
|
||||||
|
}
|
||||||
54
config/config.go
Normal file
54
config/config.go
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/bigkevmcd/go-configparser"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
initializeOnce sync.Once
|
||||||
|
Generator *GeneratorConfig
|
||||||
|
Aws *awsConfig
|
||||||
|
Redis *redisConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
var c *Config
|
||||||
|
|
||||||
|
func GetConfig() *Config {
|
||||||
|
if c == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewConfig returns a new Config struct
|
||||||
|
func NewConfig(path string) (*Config, error) {
|
||||||
|
|
||||||
|
if path == "" {
|
||||||
|
path = "imgproxy.cfg"
|
||||||
|
}
|
||||||
|
|
||||||
|
p, err := configparser.NewConfigParserFromFile(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
c = &Config{}
|
||||||
|
|
||||||
|
gc, err := getGeneratorConfig(p)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
c.Generator = gc
|
||||||
|
|
||||||
|
if p.HasSection("aws") {
|
||||||
|
c.Aws = getAwsConfig(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.HasSection("redis") {
|
||||||
|
c.Redis = getRedisConfig(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
43
config/generator.go
Normal file
43
config/generator.go
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/bigkevmcd/go-configparser"
|
||||||
|
)
|
||||||
|
|
||||||
|
type GeneratorConfig struct {
|
||||||
|
Salt []byte
|
||||||
|
Key []byte
|
||||||
|
Host string
|
||||||
|
EncryptionKey string
|
||||||
|
PlainUrl bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func getGeneratorConfig(p *configparser.ConfigParser) (*GeneratorConfig, error) {
|
||||||
|
var config string
|
||||||
|
var err error
|
||||||
|
|
||||||
|
gc := &GeneratorConfig{}
|
||||||
|
if !p.HasSection("img-proxy") {
|
||||||
|
return nil, fmt.Errorf("config error - [img-proxy] config required")
|
||||||
|
}
|
||||||
|
|
||||||
|
config, _ = p.Get("img-proxy", "key")
|
||||||
|
gc.Key = []byte(config)
|
||||||
|
|
||||||
|
config, _ = p.Get("img-proxy", "salt")
|
||||||
|
gc.Salt = []byte(config)
|
||||||
|
|
||||||
|
if config, err = p.Get("img-proxy", "host"); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
gc.Host = config
|
||||||
|
|
||||||
|
config, _ = p.Get("img-proxy", "plain-url")
|
||||||
|
gc.PlainUrl = config == "true" || config == "1"
|
||||||
|
|
||||||
|
config, _ = p.Get("img-proxy", "encryption-key")
|
||||||
|
gc.EncryptionKey = config
|
||||||
|
|
||||||
|
return gc, nil
|
||||||
|
}
|
||||||
19
config/redis.go
Normal file
19
config/redis.go
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import "github.com/bigkevmcd/go-configparser"
|
||||||
|
|
||||||
|
type redisConfig struct {
|
||||||
|
Host string
|
||||||
|
Port string
|
||||||
|
Password string
|
||||||
|
DB string
|
||||||
|
}
|
||||||
|
|
||||||
|
func getRedisConfig(p *configparser.ConfigParser) *redisConfig {
|
||||||
|
rc := &redisConfig{}
|
||||||
|
rc.Host, _ = p.Get("redis", "host")
|
||||||
|
rc.Port, _ = p.Get("redis", "port")
|
||||||
|
rc.Password, _ = p.Get("redis", "password")
|
||||||
|
rc.DB, _ = p.Get("redis", "db")
|
||||||
|
return rc
|
||||||
|
}
|
||||||
@@ -1,11 +1,17 @@
|
|||||||
package generator
|
package generator
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGenerator_GenerateBase64(t *testing.T) {
|
func TestGenerator_GenerateBase64(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
|
||||||
|
Salt: []byte("919ed8813f76abfd42968b10e05258db"),
|
||||||
|
},
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ func pkcs7pad(data []byte, blockSize int) []byte {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (g *Generator) Decrypt(s string) (string, error) {
|
func (g *Generator) Decrypt(s string) (string, error) {
|
||||||
c, err := aes.NewCipher(g.config.encryptionKeyBin)
|
c, err := aes.NewCipher(g.encryptionKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@@ -36,7 +36,7 @@ func (g *Generator) Decrypt(s string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (g *Generator) generateBaseAesEncUrl(file []byte) (string, error) {
|
func (g *Generator) generateBaseAesEncUrl(file []byte) (string, error) {
|
||||||
c, err := aes.NewCipher(g.config.encryptionKeyBin)
|
c, err := aes.NewCipher(g.encryptionKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,13 @@ const (
|
|||||||
DEF Format = "default"
|
DEF Format = "default"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func ToPtr(format Format) *Format {
|
||||||
|
return &format
|
||||||
|
}
|
||||||
|
|
||||||
func (g *Generator) StringToFormat(string string) (Format, error) {
|
func (g *Generator) StringToFormat(string string) (Format, error) {
|
||||||
switch strings.ToLower(string) {
|
s := strings.ToLower(string)
|
||||||
|
switch s {
|
||||||
case "jpg":
|
case "jpg":
|
||||||
return JPG, nil
|
return JPG, nil
|
||||||
case "jpeg":
|
case "jpeg":
|
||||||
@@ -33,6 +38,8 @@ func (g *Generator) StringToFormat(string string) (Format, error) {
|
|||||||
return GIF, nil
|
return GIF, nil
|
||||||
case "ico":
|
case "ico":
|
||||||
return ICO, nil
|
return ICO, nil
|
||||||
|
case "def":
|
||||||
|
case "default":
|
||||||
case "":
|
case "":
|
||||||
return DEF, nil
|
return DEF, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,18 @@
|
|||||||
package generator
|
package generator
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func TestGenerator_StringToFormat(t *testing.T) {
|
func TestGenerator_StringToFormat(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("2c90317177aa7a3c44fa6804bf9bf466930f36ac9262bfdae972e836a9f83d239fd6bcee0c91a29ada58cc7329c787f35d2309f0984f2fd315e2c27bac8ac247"),
|
||||||
|
Salt: []byte("2777def3372a385f4aa7e62b2b431927"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
@@ -23,7 +32,13 @@ func TestGenerator_StringToFormat(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGenerator_StringToFormatError(t *testing.T) {
|
func TestGenerator_StringToFormatError(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
|
||||||
|
Salt: []byte("919ed8813f76abfd42968b10e05258db"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,19 @@
|
|||||||
package generator
|
package generator
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func TestGenerator_GenerateUrl(t *testing.T) {
|
func TestGenerator_GenerateUrl(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
|
||||||
|
Salt: []byte("919ed8813f76abfd42968b10e05258db"),
|
||||||
|
PlainUrl: true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,14 +9,14 @@ import (
|
|||||||
|
|
||||||
func (g *Generator) generateSignature(path string) string {
|
func (g *Generator) generateSignature(path string) string {
|
||||||
var signature string
|
var signature string
|
||||||
if len(g.config.keyBin) == 0 || len(g.config.saltBin) == 0 {
|
if len(g.keyBin) == 0 || len(g.salt) == 0 {
|
||||||
signature = "insecure"
|
signature = "insecure"
|
||||||
|
|
||||||
printer.NewPrinter().LogWarning("Insecure url generated. Provide salt and key to sign and secure url.")
|
printer.NewPrinter().LogWarning("Insecure url generated. Provide salt and key to sign and secure url.")
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
mac := hmac.New(sha256.New, g.config.keyBin)
|
mac := hmac.New(sha256.New, g.keyBin)
|
||||||
mac.Write(g.config.saltBin)
|
mac.Write(g.salt)
|
||||||
mac.Write([]byte(path))
|
mac.Write([]byte(path))
|
||||||
signature = base64.RawURLEncoding.EncodeToString(mac.Sum(nil))
|
signature = base64.RawURLEncoding.EncodeToString(mac.Sum(nil))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,42 +3,33 @@ package generator
|
|||||||
import (
|
import (
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Generator struct {
|
type Generator struct {
|
||||||
config Config
|
keyBin []byte
|
||||||
}
|
salt []byte
|
||||||
|
encryptionKey []byte
|
||||||
type Config struct {
|
|
||||||
Salt []byte
|
|
||||||
saltBin []byte
|
|
||||||
Key []byte
|
|
||||||
keyBin []byte
|
|
||||||
Host string
|
|
||||||
EncryptionKey *string
|
|
||||||
encryptionKeyBin []byte
|
|
||||||
PlainUrl bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var PathPrefix string
|
var PathPrefix string
|
||||||
|
|
||||||
func NewGenerator(config Config) (*Generator, error) {
|
func NewGenerator(config *config.Config) (*Generator, error) {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
gen := new(Generator)
|
gen := new(Generator)
|
||||||
gen.config = config
|
|
||||||
|
|
||||||
if gen.config.keyBin, err = hex.DecodeString(string(gen.config.Key)); err != nil {
|
if gen.keyBin, err = hex.DecodeString(string(config.Generator.Key)); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if gen.config.saltBin, err = hex.DecodeString(string(gen.config.Salt)); err != nil {
|
if gen.salt, err = hex.DecodeString(string(config.Generator.Salt)); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if gen.config.EncryptionKey != nil && *gen.config.EncryptionKey != "" {
|
if config.Generator.EncryptionKey != "" {
|
||||||
if gen.config.encryptionKeyBin, err = hex.DecodeString(*gen.config.EncryptionKey); err != nil {
|
if gen.encryptionKey, err = hex.DecodeString(config.Generator.EncryptionKey); err != nil {
|
||||||
return nil, fmt.Errorf("key expected to be hex-encoded string")
|
return nil, fmt.Errorf("key expected to be hex-encoded string")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -62,9 +53,9 @@ func (g *Generator) GenerateUrl(file string, params []string, format Format) (st
|
|||||||
|
|
||||||
var url string
|
var url string
|
||||||
var err error
|
var err error
|
||||||
if g.config.PlainUrl {
|
if config.GetConfig().Generator.PlainUrl {
|
||||||
url, _ = g.generatePlainUrl(file)
|
url, _ = g.generatePlainUrl(file)
|
||||||
} else if g.config.encryptionKeyBin != nil {
|
} else if g.encryptionKey != nil {
|
||||||
url, err = g.generateBaseAesEncUrl([]byte(file))
|
url, err = g.generateBaseAesEncUrl([]byte(file))
|
||||||
} else {
|
} else {
|
||||||
url, _ = g.generateBase64Url([]byte(file))
|
url, _ = g.generateBase64Url([]byte(file))
|
||||||
@@ -82,5 +73,5 @@ func (g *Generator) GenerateUrl(file string, params []string, format Format) (st
|
|||||||
|
|
||||||
signature := g.generateSignature(path)
|
signature := g.generateSignature(path)
|
||||||
|
|
||||||
return fmt.Sprintf("%s/%s%s", g.config.Host, signature, path), nil
|
return fmt.Sprintf("%s/%s%s", config.GetConfig().Generator.Host, signature, path), nil
|
||||||
}
|
}
|
||||||
|
|||||||
45
go.mod
45
go.mod
@@ -1,25 +1,50 @@
|
|||||||
module github.com/siteworxpro/img-proxy-url-generator
|
module github.com/siteworxpro/img-proxy-url-generator
|
||||||
|
|
||||||
go 1.22.5
|
go 1.24.0
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/aws/aws-sdk-go v1.54.19
|
github.com/aws/aws-sdk-go v1.55.7
|
||||||
github.com/bigkevmcd/go-configparser v0.0.0-20240624060122-ccd05f93a9d2
|
github.com/bigkevmcd/go-configparser v0.0.0-20250311182818-a679eef33309
|
||||||
github.com/charmbracelet/lipgloss v0.13.0
|
github.com/charmbracelet/bubbles v0.21.0
|
||||||
github.com/urfave/cli/v2 v2.27.2
|
github.com/charmbracelet/bubbletea v1.3.5
|
||||||
|
github.com/charmbracelet/huh v0.7.0
|
||||||
|
github.com/charmbracelet/lipgloss v1.1.0
|
||||||
|
github.com/redis/go-redis/v9 v9.8.0
|
||||||
|
github.com/urfave/cli/v2 v2.27.6
|
||||||
|
google.golang.org/grpc v1.72.0
|
||||||
|
google.golang.org/protobuf v1.36.6
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/atotto/clipboard v0.1.4 // indirect
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
github.com/charmbracelet/x/ansi v0.1.4 // indirect
|
github.com/catppuccin/go v0.3.0 // indirect
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
|
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||||
|
github.com/charmbracelet/colorprofile v0.3.1 // indirect
|
||||||
|
github.com/charmbracelet/x/ansi v0.9.2 // indirect
|
||||||
|
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
|
||||||
|
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
|
||||||
|
github.com/charmbracelet/x/term v0.2.1 // indirect
|
||||||
|
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
|
||||||
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||||
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||||
github.com/jmespath/go-jmespath v0.4.0 // indirect
|
github.com/jmespath/go-jmespath v0.4.0 // indirect
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
github.com/mattn/go-localereader v0.0.1 // indirect
|
||||||
github.com/muesli/termenv v0.15.2 // indirect
|
github.com/mattn/go-runewidth v0.0.16 // indirect
|
||||||
|
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
|
||||||
|
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
||||||
|
github.com/muesli/cancelreader v0.2.2 // indirect
|
||||||
|
github.com/muesli/termenv v0.16.0 // indirect
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||||
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
|
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
|
||||||
golang.org/x/sys v0.22.0 // indirect
|
golang.org/x/net v0.40.0 // indirect
|
||||||
|
golang.org/x/sync v0.14.0 // indirect
|
||||||
|
golang.org/x/sys v0.33.0 // indirect
|
||||||
|
golang.org/x/text v0.25.0 // indirect
|
||||||
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
131
go.sum
131
go.sum
@@ -1,17 +1,73 @@
|
|||||||
github.com/aws/aws-sdk-go v1.54.19 h1:tyWV+07jagrNiCcGRzRhdtVjQs7Vy41NwsuOcl0IbVI=
|
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
|
||||||
github.com/aws/aws-sdk-go v1.54.19/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
|
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
|
||||||
|
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
|
||||||
|
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
|
||||||
|
github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
|
||||||
|
github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
||||||
github.com/bigkevmcd/go-configparser v0.0.0-20240624060122-ccd05f93a9d2 h1:2qnRmzKO1fVs2UOqyt6tRMpVB8FrOnx8IG8C2lK0cjU=
|
github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=
|
||||||
github.com/bigkevmcd/go-configparser v0.0.0-20240624060122-ccd05f93a9d2/go.mod h1:vzEQfW+A1T+AMJmTIX+SXNLNECHOM7GEinHhw0IjykI=
|
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
|
||||||
github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
|
github.com/bigkevmcd/go-configparser v0.0.0-20250311182818-a679eef33309 h1:h2H7P1M0rXm8LTJMhZWr3SAleTmR6vg+7PM1BkTumaw=
|
||||||
github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
|
github.com/bigkevmcd/go-configparser v0.0.0-20250311182818-a679eef33309/go.mod h1:vzEQfW+A1T+AMJmTIX+SXNLNECHOM7GEinHhw0IjykI=
|
||||||
github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM=
|
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||||
github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
|
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
|
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||||
|
github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
|
||||||
|
github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
|
github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
|
||||||
|
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
|
||||||
|
github.com/charmbracelet/bubbletea v1.3.5 h1:JAMNLTbqMOhSwoELIr0qyP4VidFq72/6E9j7HHmRKQc=
|
||||||
|
github.com/charmbracelet/bubbletea v1.3.5/go.mod h1:TkCnmH+aBd4LrXhXcqrKiYwRs7qyQx5rBgH5fVY3v54=
|
||||||
|
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
|
||||||
|
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
|
||||||
|
github.com/charmbracelet/huh v0.7.0 h1:W8S1uyGETgj9Tuda3/JdVkc3x7DBLZYPZc4c+/rnRdc=
|
||||||
|
github.com/charmbracelet/huh v0.7.0/go.mod h1:UGC3DZHlgOKHvHC07a5vHag41zzhpPFj34U92sOmyuk=
|
||||||
|
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
|
||||||
|
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
||||||
|
github.com/charmbracelet/x/ansi v0.9.2 h1:92AGsQmNTRMzuzHEYfCdjQeUzTrgE1vfO5/7fEVoXdY=
|
||||||
|
github.com/charmbracelet/x/ansi v0.9.2/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
|
||||||
|
github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
|
||||||
|
github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
|
||||||
|
github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U=
|
||||||
|
github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ=
|
||||||
|
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
|
||||||
|
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
|
||||||
|
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
|
||||||
|
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
|
||||||
|
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4=
|
||||||
|
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
|
||||||
|
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
|
||||||
|
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
|
||||||
|
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
|
||||||
|
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
|
||||||
|
github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGlqCbtI=
|
||||||
|
github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4=
|
||||||
|
github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
|
||||||
|
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||||
|
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
|
||||||
|
github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
|
||||||
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
|
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||||
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||||
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
||||||
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
|
||||||
|
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
|
||||||
|
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||||
|
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
||||||
|
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
||||||
|
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||||
|
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||||
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
|
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
|
||||||
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
|
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
|
||||||
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
|
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
|
||||||
@@ -24,25 +80,64 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
|
|||||||
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
|
||||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
|
||||||
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
|
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||||
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
|
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||||
|
github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
|
||||||
|
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
|
||||||
|
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
|
||||||
|
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
|
||||||
|
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
|
||||||
|
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
|
||||||
|
github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
|
||||||
|
github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI=
|
||||||
|
github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
|
||||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
|
github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
|
||||||
github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
|
github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
|
||||||
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
||||||
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
||||||
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
|
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
|
||||||
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
|
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
|
||||||
|
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
|
||||||
|
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
|
||||||
|
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
|
||||||
|
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
|
||||||
|
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
|
||||||
|
go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
|
||||||
|
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
|
||||||
|
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
|
||||||
|
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
|
||||||
|
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
|
||||||
|
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
|
||||||
|
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
|
||||||
|
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
|
||||||
|
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
|
||||||
|
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
||||||
|
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
||||||
|
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
|
||||||
|
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||||
|
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
|
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||||
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
|
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
||||||
|
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
||||||
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 h1:IkAfh6J/yllPtpYFU0zZN1hUPYdT0ogkBT/9hMxHjvg=
|
||||||
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
|
||||||
|
google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
|
||||||
|
google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
|
||||||
|
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
|
||||||
|
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||||
|
|||||||
304
grpc/imgurl.pb.go
Normal file
304
grpc/imgurl.pb.go
Normal file
@@ -0,0 +1,304 @@
|
|||||||
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
|
// versions:
|
||||||
|
// protoc-gen-go v1.34.1
|
||||||
|
// protoc v5.28.3
|
||||||
|
// source: imgurl.proto
|
||||||
|
|
||||||
|
package grpc
|
||||||
|
|
||||||
|
import (
|
||||||
|
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
||||||
|
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
|
||||||
|
reflect "reflect"
|
||||||
|
sync "sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Verify that this generated code is sufficiently up-to-date.
|
||||||
|
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
|
||||||
|
// Verify that runtime/protoimpl is sufficiently up-to-date.
|
||||||
|
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
|
||||||
|
)
|
||||||
|
|
||||||
|
type Format int32
|
||||||
|
|
||||||
|
const (
|
||||||
|
Format_JPG Format = 0
|
||||||
|
Format_PNG Format = 1
|
||||||
|
Format_BMP Format = 2
|
||||||
|
Format_WEBP Format = 3
|
||||||
|
Format_GIF Format = 4
|
||||||
|
Format_ICO Format = 5
|
||||||
|
)
|
||||||
|
|
||||||
|
// Enum value maps for Format.
|
||||||
|
var (
|
||||||
|
Format_name = map[int32]string{
|
||||||
|
0: "JPG",
|
||||||
|
1: "PNG",
|
||||||
|
2: "BMP",
|
||||||
|
3: "WEBP",
|
||||||
|
4: "GIF",
|
||||||
|
5: "ICO",
|
||||||
|
}
|
||||||
|
Format_value = map[string]int32{
|
||||||
|
"JPG": 0,
|
||||||
|
"PNG": 1,
|
||||||
|
"BMP": 2,
|
||||||
|
"WEBP": 3,
|
||||||
|
"GIF": 4,
|
||||||
|
"ICO": 5,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func (x Format) Enum() *Format {
|
||||||
|
p := new(Format)
|
||||||
|
*p = x
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x Format) String() string {
|
||||||
|
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (Format) Descriptor() protoreflect.EnumDescriptor {
|
||||||
|
return file_imgurl_proto_enumTypes[0].Descriptor()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (Format) Type() protoreflect.EnumType {
|
||||||
|
return &file_imgurl_proto_enumTypes[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x Format) Number() protoreflect.EnumNumber {
|
||||||
|
return protoreflect.EnumNumber(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use Format.Descriptor instead.
|
||||||
|
func (Format) EnumDescriptor() ([]byte, []int) {
|
||||||
|
return file_imgurl_proto_rawDescGZIP(), []int{0}
|
||||||
|
}
|
||||||
|
|
||||||
|
type UrlRequest struct {
|
||||||
|
state protoimpl.MessageState
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
Image string `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
|
||||||
|
Params []string `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty"`
|
||||||
|
Format *Format `protobuf:"varint,3,opt,name=format,proto3,enum=Format,oneof" json:"format,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlRequest) Reset() {
|
||||||
|
*x = UrlRequest{}
|
||||||
|
if protoimpl.UnsafeEnabled {
|
||||||
|
mi := &file_imgurl_proto_msgTypes[0]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlRequest) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UrlRequest) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *UrlRequest) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_imgurl_proto_msgTypes[0]
|
||||||
|
if protoimpl.UnsafeEnabled && x != nil {
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
if ms.LoadMessageInfo() == nil {
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
return ms
|
||||||
|
}
|
||||||
|
return mi.MessageOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use UrlRequest.ProtoReflect.Descriptor instead.
|
||||||
|
func (*UrlRequest) Descriptor() ([]byte, []int) {
|
||||||
|
return file_imgurl_proto_rawDescGZIP(), []int{0}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlRequest) GetImage() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Image
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlRequest) GetParams() []string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Params
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlRequest) GetFormat() Format {
|
||||||
|
if x != nil && x.Format != nil {
|
||||||
|
return *x.Format
|
||||||
|
}
|
||||||
|
return Format_JPG
|
||||||
|
}
|
||||||
|
|
||||||
|
type UrlResponse struct {
|
||||||
|
state protoimpl.MessageState
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlResponse) Reset() {
|
||||||
|
*x = UrlResponse{}
|
||||||
|
if protoimpl.UnsafeEnabled {
|
||||||
|
mi := &file_imgurl_proto_msgTypes[1]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlResponse) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UrlResponse) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *UrlResponse) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_imgurl_proto_msgTypes[1]
|
||||||
|
if protoimpl.UnsafeEnabled && x != nil {
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
if ms.LoadMessageInfo() == nil {
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
return ms
|
||||||
|
}
|
||||||
|
return mi.MessageOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use UrlResponse.ProtoReflect.Descriptor instead.
|
||||||
|
func (*UrlResponse) Descriptor() ([]byte, []int) {
|
||||||
|
return file_imgurl_proto_rawDescGZIP(), []int{1}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UrlResponse) GetUrl() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Url
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
var File_imgurl_proto protoreflect.FileDescriptor
|
||||||
|
|
||||||
|
var file_imgurl_proto_rawDesc = []byte{
|
||||||
|
0x0a, 0x0c, 0x69, 0x6d, 0x67, 0x75, 0x72, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6b,
|
||||||
|
0x0a, 0x0a, 0x55, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05,
|
||||||
|
0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61,
|
||||||
|
0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03,
|
||||||
|
0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x24, 0x0a, 0x06, 0x66, 0x6f,
|
||||||
|
0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x07, 0x2e, 0x46, 0x6f, 0x72,
|
||||||
|
0x6d, 0x61, 0x74, 0x48, 0x00, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x88, 0x01, 0x01,
|
||||||
|
0x42, 0x09, 0x0a, 0x07, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x1f, 0x0a, 0x0b, 0x55,
|
||||||
|
0x72, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72,
|
||||||
|
0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x2a, 0x3f, 0x0a, 0x06,
|
||||||
|
0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x07, 0x0a, 0x03, 0x4a, 0x50, 0x47, 0x10, 0x00, 0x12,
|
||||||
|
0x07, 0x0a, 0x03, 0x50, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x4d, 0x50, 0x10,
|
||||||
|
0x02, 0x12, 0x08, 0x0a, 0x04, 0x57, 0x45, 0x42, 0x50, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x47,
|
||||||
|
0x49, 0x46, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x49, 0x43, 0x4f, 0x10, 0x05, 0x32, 0x34, 0x0a,
|
||||||
|
0x09, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x27, 0x0a, 0x08, 0x47, 0x65,
|
||||||
|
0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x2e, 0x55, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75,
|
||||||
|
0x65, 0x73, 0x74, 0x1a, 0x0c, 0x2e, 0x55, 0x72, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
|
||||||
|
0x65, 0x22, 0x00, 0x42, 0x90, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
|
||||||
|
0x6f, 0x6d, 0x2f, 0x73, 0x69, 0x74, 0x65, 0x77, 0x6f, 0x72, 0x78, 0x70, 0x72, 0x6f, 0x2f, 0x69,
|
||||||
|
0x6d, 0x67, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x75, 0x72, 0x6c, 0x2d, 0x67, 0x65, 0x6e,
|
||||||
|
0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x67, 0x72, 0x70, 0x63, 0xca, 0x02, 0x26, 0x53, 0x69,
|
||||||
|
0x74, 0x65, 0x77, 0x6f, 0x72, 0x78, 0x5c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x5c, 0x49,
|
||||||
|
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5c, 0x49, 0x6d, 0x67, 0x50,
|
||||||
|
0x72, 0x6f, 0x78, 0x79, 0xe2, 0x02, 0x2f, 0x53, 0x69, 0x74, 0x65, 0x77, 0x6f, 0x72, 0x78, 0x5c,
|
||||||
|
0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74,
|
||||||
|
0x69, 0x6f, 0x6e, 0x73, 0x5c, 0x49, 0x6d, 0x67, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x5c, 0x4d, 0x65,
|
||||||
|
0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
file_imgurl_proto_rawDescOnce sync.Once
|
||||||
|
file_imgurl_proto_rawDescData = file_imgurl_proto_rawDesc
|
||||||
|
)
|
||||||
|
|
||||||
|
func file_imgurl_proto_rawDescGZIP() []byte {
|
||||||
|
file_imgurl_proto_rawDescOnce.Do(func() {
|
||||||
|
file_imgurl_proto_rawDescData = protoimpl.X.CompressGZIP(file_imgurl_proto_rawDescData)
|
||||||
|
})
|
||||||
|
return file_imgurl_proto_rawDescData
|
||||||
|
}
|
||||||
|
|
||||||
|
var file_imgurl_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||||
|
var file_imgurl_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
|
||||||
|
var file_imgurl_proto_goTypes = []interface{}{
|
||||||
|
(Format)(0), // 0: Format
|
||||||
|
(*UrlRequest)(nil), // 1: UrlRequest
|
||||||
|
(*UrlResponse)(nil), // 2: UrlResponse
|
||||||
|
}
|
||||||
|
var file_imgurl_proto_depIdxs = []int32{
|
||||||
|
0, // 0: UrlRequest.format:type_name -> Format
|
||||||
|
1, // 1: Generator.Generate:input_type -> UrlRequest
|
||||||
|
2, // 2: Generator.Generate:output_type -> UrlResponse
|
||||||
|
2, // [2:3] is the sub-list for method output_type
|
||||||
|
1, // [1:2] is the sub-list for method input_type
|
||||||
|
1, // [1:1] is the sub-list for extension type_name
|
||||||
|
1, // [1:1] is the sub-list for extension extendee
|
||||||
|
0, // [0:1] is the sub-list for field type_name
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() { file_imgurl_proto_init() }
|
||||||
|
func file_imgurl_proto_init() {
|
||||||
|
if File_imgurl_proto != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !protoimpl.UnsafeEnabled {
|
||||||
|
file_imgurl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||||
|
switch v := v.(*UrlRequest); i {
|
||||||
|
case 0:
|
||||||
|
return &v.state
|
||||||
|
case 1:
|
||||||
|
return &v.sizeCache
|
||||||
|
case 2:
|
||||||
|
return &v.unknownFields
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
file_imgurl_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
||||||
|
switch v := v.(*UrlResponse); i {
|
||||||
|
case 0:
|
||||||
|
return &v.state
|
||||||
|
case 1:
|
||||||
|
return &v.sizeCache
|
||||||
|
case 2:
|
||||||
|
return &v.unknownFields
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
file_imgurl_proto_msgTypes[0].OneofWrappers = []interface{}{}
|
||||||
|
type x struct{}
|
||||||
|
out := protoimpl.TypeBuilder{
|
||||||
|
File: protoimpl.DescBuilder{
|
||||||
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
|
RawDescriptor: file_imgurl_proto_rawDesc,
|
||||||
|
NumEnums: 1,
|
||||||
|
NumMessages: 2,
|
||||||
|
NumExtensions: 0,
|
||||||
|
NumServices: 1,
|
||||||
|
},
|
||||||
|
GoTypes: file_imgurl_proto_goTypes,
|
||||||
|
DependencyIndexes: file_imgurl_proto_depIdxs,
|
||||||
|
EnumInfos: file_imgurl_proto_enumTypes,
|
||||||
|
MessageInfos: file_imgurl_proto_msgTypes,
|
||||||
|
}.Build()
|
||||||
|
File_imgurl_proto = out.File
|
||||||
|
file_imgurl_proto_rawDesc = nil
|
||||||
|
file_imgurl_proto_goTypes = nil
|
||||||
|
file_imgurl_proto_depIdxs = nil
|
||||||
|
}
|
||||||
29
grpc/imgurl.proto
Normal file
29
grpc/imgurl.proto
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option go_package = "github.com/siteworxpro/img-proxy-url-generator/grpc";
|
||||||
|
option php_namespace = "SomeNamespace\\ImgProxy";
|
||||||
|
option php_metadata_namespace = "SomeNamespace\\ImgProxy\\Metadata";
|
||||||
|
|
||||||
|
|
||||||
|
message UrlRequest {
|
||||||
|
string image = 1;
|
||||||
|
repeated string params = 2;
|
||||||
|
optional Format format = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum Format {
|
||||||
|
JPG = 0;
|
||||||
|
PNG = 1;
|
||||||
|
BMP = 2;
|
||||||
|
WEBP = 3;
|
||||||
|
GIF = 4;
|
||||||
|
ICO = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UrlResponse {
|
||||||
|
string url = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
service Generator {
|
||||||
|
rpc Generate (UrlRequest) returns (UrlResponse) {}
|
||||||
|
}
|
||||||
121
grpc/imgurl_grpc.pb.go
Normal file
121
grpc/imgurl_grpc.pb.go
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
|
// versions:
|
||||||
|
// - protoc-gen-go-grpc v1.5.1
|
||||||
|
// - protoc v5.28.3
|
||||||
|
// source: imgurl.proto
|
||||||
|
|
||||||
|
package grpc
|
||||||
|
|
||||||
|
import (
|
||||||
|
context "context"
|
||||||
|
grpc "google.golang.org/grpc"
|
||||||
|
codes "google.golang.org/grpc/codes"
|
||||||
|
status "google.golang.org/grpc/status"
|
||||||
|
)
|
||||||
|
|
||||||
|
// This is a compile-time assertion to ensure that this generated file
|
||||||
|
// is compatible with the grpc package it is being compiled against.
|
||||||
|
// Requires gRPC-Go v1.64.0 or later.
|
||||||
|
const _ = grpc.SupportPackageIsVersion9
|
||||||
|
|
||||||
|
const (
|
||||||
|
Generator_Generate_FullMethodName = "/Generator/Generate"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GeneratorClient is the client API for Generator service.
|
||||||
|
//
|
||||||
|
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
|
||||||
|
type GeneratorClient interface {
|
||||||
|
Generate(ctx context.Context, in *UrlRequest, opts ...grpc.CallOption) (*UrlResponse, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type generatorClient struct {
|
||||||
|
cc grpc.ClientConnInterface
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewGeneratorClient(cc grpc.ClientConnInterface) GeneratorClient {
|
||||||
|
return &generatorClient{cc}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *generatorClient) Generate(ctx context.Context, in *UrlRequest, opts ...grpc.CallOption) (*UrlResponse, error) {
|
||||||
|
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||||
|
out := new(UrlResponse)
|
||||||
|
err := c.cc.Invoke(ctx, Generator_Generate_FullMethodName, in, out, cOpts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GeneratorServer is the server API for Generator service.
|
||||||
|
// All implementations must embed UnimplementedGeneratorServer
|
||||||
|
// for forward compatibility.
|
||||||
|
type GeneratorServer interface {
|
||||||
|
Generate(context.Context, *UrlRequest) (*UrlResponse, error)
|
||||||
|
mustEmbedUnimplementedGeneratorServer()
|
||||||
|
}
|
||||||
|
|
||||||
|
// UnimplementedGeneratorServer must be embedded to have
|
||||||
|
// forward compatible implementations.
|
||||||
|
//
|
||||||
|
// NOTE: this should be embedded by value instead of pointer to avoid a nil
|
||||||
|
// pointer dereference when methods are called.
|
||||||
|
type UnimplementedGeneratorServer struct{}
|
||||||
|
|
||||||
|
func (UnimplementedGeneratorServer) Generate(context.Context, *UrlRequest) (*UrlResponse, error) {
|
||||||
|
return nil, status.Errorf(codes.Unimplemented, "method Generate not implemented")
|
||||||
|
}
|
||||||
|
func (UnimplementedGeneratorServer) mustEmbedUnimplementedGeneratorServer() {}
|
||||||
|
func (UnimplementedGeneratorServer) testEmbeddedByValue() {}
|
||||||
|
|
||||||
|
// UnsafeGeneratorServer may be embedded to opt out of forward compatibility for this service.
|
||||||
|
// Use of this interface is not recommended, as added methods to GeneratorServer will
|
||||||
|
// result in compilation errors.
|
||||||
|
type UnsafeGeneratorServer interface {
|
||||||
|
mustEmbedUnimplementedGeneratorServer()
|
||||||
|
}
|
||||||
|
|
||||||
|
func RegisterGeneratorServer(s grpc.ServiceRegistrar, srv GeneratorServer) {
|
||||||
|
// If the following call pancis, it indicates UnimplementedGeneratorServer was
|
||||||
|
// embedded by pointer and is nil. This will cause panics if an
|
||||||
|
// unimplemented method is ever invoked, so we test this at initialization
|
||||||
|
// time to prevent it from happening at runtime later due to I/O.
|
||||||
|
if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
|
||||||
|
t.testEmbeddedByValue()
|
||||||
|
}
|
||||||
|
s.RegisterService(&Generator_ServiceDesc, srv)
|
||||||
|
}
|
||||||
|
|
||||||
|
func _Generator_Generate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||||
|
in := new(UrlRequest)
|
||||||
|
if err := dec(in); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if interceptor == nil {
|
||||||
|
return srv.(GeneratorServer).Generate(ctx, in)
|
||||||
|
}
|
||||||
|
info := &grpc.UnaryServerInfo{
|
||||||
|
Server: srv,
|
||||||
|
FullMethod: Generator_Generate_FullMethodName,
|
||||||
|
}
|
||||||
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||||
|
return srv.(GeneratorServer).Generate(ctx, req.(*UrlRequest))
|
||||||
|
}
|
||||||
|
return interceptor(ctx, in, info, handler)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generator_ServiceDesc is the grpc.ServiceDesc for Generator service.
|
||||||
|
// It's only intended for direct use with grpc.RegisterService,
|
||||||
|
// and not to be introspected or modified (even as a copy)
|
||||||
|
var Generator_ServiceDesc = grpc.ServiceDesc{
|
||||||
|
ServiceName: "Generator",
|
||||||
|
HandlerType: (*GeneratorServer)(nil),
|
||||||
|
Methods: []grpc.MethodDesc{
|
||||||
|
{
|
||||||
|
MethodName: "Generate",
|
||||||
|
Handler: _Generator_Generate_Handler,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Streams: []grpc.StreamDesc{},
|
||||||
|
Metadata: "imgurl.proto",
|
||||||
|
}
|
||||||
0
grpc/php/src/.gitkeep
Normal file
0
grpc/php/src/.gitkeep
Normal file
49
grpc/server.go
Normal file
49
grpc/server.go
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
package grpc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type GeneratorService struct {
|
||||||
|
UnimplementedGeneratorServer
|
||||||
|
imgGenerator *generator.Generator
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewService(config *config.Config) (*GeneratorService, error) {
|
||||||
|
g, err := generator.NewGenerator(config)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &GeneratorService{imgGenerator: g}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *GeneratorService) Generate(c context.Context, r *UrlRequest) (*UrlResponse, error) {
|
||||||
|
defer c.Done()
|
||||||
|
|
||||||
|
var err error
|
||||||
|
format := generator.DEF
|
||||||
|
|
||||||
|
if r.Format != nil {
|
||||||
|
format, err = s.imgGenerator.StringToFormat(r.Format.String())
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
url, err := s.imgGenerator.GenerateUrl(r.Image, r.Params, format)
|
||||||
|
if err != nil {
|
||||||
|
println(err.Error())
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println(fmt.Sprintf("%s - [%s] - (%s)", r.Image, strings.Join(r.Params, ","), url))
|
||||||
|
|
||||||
|
return &UrlResponse{Url: url}, nil
|
||||||
|
}
|
||||||
140
interactive/model.go
Normal file
140
interactive/model.go
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
package interactive
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
cbhelp "github.com/charmbracelet/bubbles/help"
|
||||||
|
"github.com/charmbracelet/bubbles/key"
|
||||||
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/interactive/params"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Model struct {
|
||||||
|
Fields []huh.Field
|
||||||
|
generator *generator.Generator
|
||||||
|
url *string
|
||||||
|
format *generator.Format
|
||||||
|
selectedParams *[]UrlParam
|
||||||
|
err error
|
||||||
|
focusField huh.Field
|
||||||
|
inParamsFields bool
|
||||||
|
help cbhelp.Model
|
||||||
|
}
|
||||||
|
|
||||||
|
type UrlParam interface {
|
||||||
|
Value() string
|
||||||
|
Display() string
|
||||||
|
Key() string
|
||||||
|
Input() []huh.Field
|
||||||
|
}
|
||||||
|
|
||||||
|
func InitialModel(c *cli.Context) Model {
|
||||||
|
|
||||||
|
m := Model{
|
||||||
|
url: aws.String(""),
|
||||||
|
selectedParams: &[]UrlParam{},
|
||||||
|
format: generator.ToPtr(generator.DEF),
|
||||||
|
}
|
||||||
|
|
||||||
|
fields := make([]huh.Field, 0)
|
||||||
|
fields = append(fields, m.initialFields()...)
|
||||||
|
|
||||||
|
m.Fields = fields
|
||||||
|
|
||||||
|
cfg, _ := config.NewConfig(c.String("config"))
|
||||||
|
|
||||||
|
if cfg == nil {
|
||||||
|
err := fmt.Errorf("config not loaded")
|
||||||
|
m.err = err
|
||||||
|
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
g, err := generator.NewGenerator(cfg)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
m.err = err
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
m.generator = g
|
||||||
|
|
||||||
|
m.help = cbhelp.New()
|
||||||
|
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m Model) initialFields() []huh.Field {
|
||||||
|
|
||||||
|
fields := make([]huh.Field, 0)
|
||||||
|
|
||||||
|
options := []UrlParam{
|
||||||
|
params.NewHeight(),
|
||||||
|
params.NewWidth(),
|
||||||
|
params.NewResize(),
|
||||||
|
params.NewMinWidth(),
|
||||||
|
params.NewMinHeight(),
|
||||||
|
params.NewQuality(),
|
||||||
|
params.NewZoom(),
|
||||||
|
params.NewEnlarge(),
|
||||||
|
}
|
||||||
|
|
||||||
|
var huhOptions []huh.Option[UrlParam]
|
||||||
|
for _, option := range options {
|
||||||
|
huhOptions = append(huhOptions, huh.NewOption[UrlParam](option.Display(), option))
|
||||||
|
}
|
||||||
|
|
||||||
|
fields = append(fields,
|
||||||
|
huh.NewInput().
|
||||||
|
Key("imgUrl").
|
||||||
|
Description("The URL of the image to generate a proxy for.").
|
||||||
|
Title("Image URL").
|
||||||
|
Value(m.url).
|
||||||
|
Prompt("Enter the image URL:"),
|
||||||
|
)
|
||||||
|
fields = append(fields,
|
||||||
|
huh.NewMultiSelect[UrlParam]().
|
||||||
|
Description("Params to add to the URL.").
|
||||||
|
Options(huhOptions...).
|
||||||
|
Value(m.selectedParams).
|
||||||
|
WithKeyMap(&huh.KeyMap{
|
||||||
|
MultiSelect: huh.MultiSelectKeyMap{
|
||||||
|
Up: key.NewBinding(key.WithKeys("up"), key.WithHelp("up", "up")),
|
||||||
|
Down: key.NewBinding(key.WithKeys("down"), key.WithHelp("down", "down")),
|
||||||
|
Toggle: key.NewBinding(key.WithKeys(" "), key.WithHelp(" ", "toggle")),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
fields = append(fields, huh.NewSelect[generator.Format]().
|
||||||
|
Description("Convert the image format.").
|
||||||
|
Options(
|
||||||
|
huh.NewOption[generator.Format]("JPEG", generator.JPG),
|
||||||
|
huh.NewOption[generator.Format]("PNG", generator.PNG),
|
||||||
|
huh.NewOption[generator.Format]("BMP", generator.BMP),
|
||||||
|
huh.NewOption[generator.Format]("WEBP", generator.WEBP),
|
||||||
|
huh.NewOption[generator.Format]("GIF", generator.GIF),
|
||||||
|
huh.NewOption[generator.Format]("ICO", generator.ICO),
|
||||||
|
huh.NewOption[generator.Format]("Default", generator.DEF),
|
||||||
|
).
|
||||||
|
Key("format").
|
||||||
|
Title("Format").
|
||||||
|
Value(m.format).
|
||||||
|
WithKeyMap(&huh.KeyMap{
|
||||||
|
Select: huh.SelectKeyMap{
|
||||||
|
Up: key.NewBinding(key.WithKeys("up"), key.WithHelp("up", "up")),
|
||||||
|
Down: key.NewBinding(key.WithKeys("down"), key.WithHelp("down", "down")),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
return fields
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m Model) Init() tea.Cmd {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
51
interactive/params/enlarge.go
Normal file
51
interactive/params/enlarge.go
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Enlarge struct {
|
||||||
|
enlarge *[]string
|
||||||
|
field huh.Field
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewEnlarge() *Enlarge {
|
||||||
|
e := &Enlarge{
|
||||||
|
enlarge: &[]string{},
|
||||||
|
field: huh.NewMultiSelect[string]().
|
||||||
|
Options(
|
||||||
|
huh.NewOption("true", "true"),
|
||||||
|
).
|
||||||
|
Description("Whether to enlarge the image.").
|
||||||
|
WithKeyMap(
|
||||||
|
huh.NewDefaultKeyMap(),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
|
e.enlarge = &[]string{}
|
||||||
|
e.field.(*huh.MultiSelect[string]).Value(e.enlarge)
|
||||||
|
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e Enlarge) Display() string {
|
||||||
|
return "enlarge"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e Enlarge) Value() string {
|
||||||
|
value := "0"
|
||||||
|
|
||||||
|
if len(*e.enlarge) > 0 {
|
||||||
|
value = "1"
|
||||||
|
}
|
||||||
|
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e Enlarge) Key() string {
|
||||||
|
return "el"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e Enlarge) Input() []huh.Field {
|
||||||
|
return []huh.Field{e.field}
|
||||||
|
}
|
||||||
41
interactive/params/height.go
Normal file
41
interactive/params/height.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Height struct {
|
||||||
|
paramValue *string
|
||||||
|
field *huh.Input
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHeight() *Height {
|
||||||
|
h := &Height{
|
||||||
|
paramValue: aws.String(""),
|
||||||
|
field: huh.NewInput().
|
||||||
|
Key("h").
|
||||||
|
Description("The height of the image.").
|
||||||
|
Title("Height"),
|
||||||
|
}
|
||||||
|
|
||||||
|
h.field.Value(h.paramValue)
|
||||||
|
|
||||||
|
return h
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Height) Display() string {
|
||||||
|
return "height"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Height) Value() string {
|
||||||
|
return *h.paramValue
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Height) Key() string {
|
||||||
|
return "h"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Height) Input() []huh.Field {
|
||||||
|
return []huh.Field{h.field}
|
||||||
|
}
|
||||||
42
interactive/params/min-height.go
Normal file
42
interactive/params/min-height.go
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MinHeight struct {
|
||||||
|
paramValue *string
|
||||||
|
field *huh.Input
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMinHeight() *MinHeight {
|
||||||
|
mh := &MinHeight{
|
||||||
|
paramValue: nil,
|
||||||
|
field: huh.NewInput().
|
||||||
|
Key("min-height").
|
||||||
|
Description("The minimum height of the image.").
|
||||||
|
Title("Min Height"),
|
||||||
|
}
|
||||||
|
|
||||||
|
mh.paramValue = aws.String("")
|
||||||
|
mh.field.Value(mh.paramValue)
|
||||||
|
|
||||||
|
return mh
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mh MinHeight) Display() string {
|
||||||
|
return "min-height"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mh MinHeight) Value() string {
|
||||||
|
return *mh.paramValue
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mh MinHeight) Key() string {
|
||||||
|
return "mh"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mh MinHeight) Input() []huh.Field {
|
||||||
|
return []huh.Field{mh.field}
|
||||||
|
}
|
||||||
42
interactive/params/min-width.go
Normal file
42
interactive/params/min-width.go
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MinWidth struct {
|
||||||
|
paramValue *string
|
||||||
|
field *huh.Input
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMinWidth() *MinWidth {
|
||||||
|
mw := &MinWidth{
|
||||||
|
paramValue: nil,
|
||||||
|
field: huh.NewInput().
|
||||||
|
Key("min-width").
|
||||||
|
Description("The minimum width of the image.").
|
||||||
|
Title("Min Width"),
|
||||||
|
}
|
||||||
|
|
||||||
|
mw.paramValue = aws.String("")
|
||||||
|
mw.field.Value(mw.paramValue)
|
||||||
|
|
||||||
|
return mw
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mw MinWidth) Display() string {
|
||||||
|
return "min-width"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mw MinWidth) Value() string {
|
||||||
|
return *mw.paramValue
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mw MinWidth) Key() string {
|
||||||
|
return "mw"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mw MinWidth) Input() []huh.Field {
|
||||||
|
return []huh.Field{mw.field}
|
||||||
|
}
|
||||||
41
interactive/params/quality.go
Normal file
41
interactive/params/quality.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Quality struct {
|
||||||
|
value *string
|
||||||
|
field *huh.Input
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewQuality() *Quality {
|
||||||
|
z := &Quality{
|
||||||
|
value: aws.String(""),
|
||||||
|
field: huh.NewInput().
|
||||||
|
Key("q").
|
||||||
|
Description("Quality of the image 0-100").
|
||||||
|
Title("Quality"),
|
||||||
|
}
|
||||||
|
|
||||||
|
z.field.Value(z.value)
|
||||||
|
|
||||||
|
return z
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Quality) Value() string {
|
||||||
|
return *z.value
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Quality) Display() string {
|
||||||
|
return "quality"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Quality) Key() string {
|
||||||
|
return "q"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Quality) Input() []huh.Field {
|
||||||
|
return []huh.Field{z.field}
|
||||||
|
}
|
||||||
99
interactive/params/resize.go
Normal file
99
interactive/params/resize.go
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Resize struct {
|
||||||
|
fields []huh.Field
|
||||||
|
height *string
|
||||||
|
width *string
|
||||||
|
resizeType *string
|
||||||
|
enlarge *[]string
|
||||||
|
extent *[]string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewResize() *Resize {
|
||||||
|
rs := &Resize{
|
||||||
|
fields: []huh.Field{
|
||||||
|
huh.NewInput().
|
||||||
|
Key("resize.height").
|
||||||
|
Description("The height of the image.").
|
||||||
|
Title("Height"),
|
||||||
|
huh.NewInput().
|
||||||
|
Key("resize.width").
|
||||||
|
Description("The width of the image.").
|
||||||
|
Title("Width"),
|
||||||
|
huh.NewSelect[string]().
|
||||||
|
Title("Resize Type").
|
||||||
|
Options(
|
||||||
|
huh.NewOption("fit", "fit"),
|
||||||
|
huh.NewOption("fill", "fill"),
|
||||||
|
huh.NewOption("fill-down", "fill-down"),
|
||||||
|
huh.NewOption("force", "force"),
|
||||||
|
huh.NewOption("auto", "auto"),
|
||||||
|
).WithKeyMap(huh.NewDefaultKeyMap()),
|
||||||
|
huh.NewMultiSelect[string]().
|
||||||
|
Options(
|
||||||
|
huh.NewOption("true", "true"),
|
||||||
|
).
|
||||||
|
Description("Whether to enlarge the image.").
|
||||||
|
WithKeyMap(
|
||||||
|
huh.NewDefaultKeyMap(),
|
||||||
|
),
|
||||||
|
huh.NewMultiSelect[string]().
|
||||||
|
Options(
|
||||||
|
huh.NewOption("true", "true"),
|
||||||
|
).
|
||||||
|
Description("Whether to extend the image.").
|
||||||
|
WithKeyMap(
|
||||||
|
huh.NewDefaultKeyMap(),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
rs.height = aws.String("")
|
||||||
|
rs.width = aws.String("")
|
||||||
|
rs.enlarge = &[]string{}
|
||||||
|
rs.extent = &[]string{}
|
||||||
|
rs.resizeType = aws.String("auto")
|
||||||
|
|
||||||
|
rs.fields[0].(*huh.Input).Value(rs.height)
|
||||||
|
rs.fields[1].(*huh.Input).Value(rs.width)
|
||||||
|
rs.fields[2].(*huh.Select[string]).Value(rs.resizeType)
|
||||||
|
rs.fields[3].(*huh.MultiSelect[string]).Value(rs.enlarge)
|
||||||
|
rs.fields[4].(*huh.MultiSelect[string]).Value(rs.extent)
|
||||||
|
|
||||||
|
return rs
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r Resize) Display() string {
|
||||||
|
return "resize"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r Resize) Value() string {
|
||||||
|
if *r.height == "" || *r.width == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
resize := "0"
|
||||||
|
if *r.enlarge != nil && len(*r.enlarge) > 0 {
|
||||||
|
resize = "1"
|
||||||
|
}
|
||||||
|
|
||||||
|
extent := "0"
|
||||||
|
if *r.extent != nil && len(*r.extent) > 0 {
|
||||||
|
extent = "1"
|
||||||
|
}
|
||||||
|
|
||||||
|
return *r.resizeType + ":" + *r.height + ":" + *r.width + ":" + resize + ":" + extent
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r Resize) Key() string {
|
||||||
|
return "rs"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r Resize) Input() []huh.Field {
|
||||||
|
return r.fields
|
||||||
|
}
|
||||||
41
interactive/params/width.go
Normal file
41
interactive/params/width.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Width struct {
|
||||||
|
paramValue *string
|
||||||
|
field *huh.Input
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewWidth() *Width {
|
||||||
|
w := &Width{
|
||||||
|
paramValue: aws.String(""),
|
||||||
|
field: huh.NewInput().
|
||||||
|
Key("h").
|
||||||
|
Description("The width of the image.").
|
||||||
|
Title("Width"),
|
||||||
|
}
|
||||||
|
|
||||||
|
w.field.Value(w.paramValue)
|
||||||
|
|
||||||
|
return w
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Width) Display() string {
|
||||||
|
return "width"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Width) Value() string {
|
||||||
|
return *h.paramValue
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Width) Key() string {
|
||||||
|
return "h"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Width) Input() []huh.Field {
|
||||||
|
return []huh.Field{h.field}
|
||||||
|
}
|
||||||
41
interactive/params/zoom.go
Normal file
41
interactive/params/zoom.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package params
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Zoom struct {
|
||||||
|
zoom *string
|
||||||
|
field huh.Field
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewZoom() *Zoom {
|
||||||
|
z := &Zoom{
|
||||||
|
zoom: aws.String(""),
|
||||||
|
field: huh.NewInput().
|
||||||
|
Key("z").
|
||||||
|
Description("Percentage to zoom the image (1.4 == 140%) .").
|
||||||
|
Title("Zoom"),
|
||||||
|
}
|
||||||
|
|
||||||
|
z.field.(*huh.Input).Value(z.zoom)
|
||||||
|
|
||||||
|
return z
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Zoom) Value() string {
|
||||||
|
return *z.zoom
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Zoom) Display() string {
|
||||||
|
return "zoom"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Zoom) Key() string {
|
||||||
|
return "z"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *Zoom) Input() []huh.Field {
|
||||||
|
return []huh.Field{z.field}
|
||||||
|
}
|
||||||
99
interactive/update.go
Normal file
99
interactive/update.go
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
package interactive
|
||||||
|
|
||||||
|
import (
|
||||||
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
"github.com/charmbracelet/huh"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
|
|
||||||
|
if m.focusField == nil {
|
||||||
|
m.Fields[0].Focus()
|
||||||
|
m.focusField = m.Fields[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
if msg, ok := msg.(tea.KeyMsg); ok {
|
||||||
|
switch msg.String() {
|
||||||
|
case "tab":
|
||||||
|
if m.focusField != nil {
|
||||||
|
|
||||||
|
index := -1
|
||||||
|
|
||||||
|
selectedParamFields := make([]huh.Field, 0)
|
||||||
|
for _, field := range *m.selectedParams {
|
||||||
|
for _, f := range field.Input() {
|
||||||
|
selectedParamFields = append(selectedParamFields, f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if m.inParamsFields {
|
||||||
|
for i, field := range selectedParamFields {
|
||||||
|
if field == m.focusField {
|
||||||
|
index = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for i, field := range m.Fields {
|
||||||
|
if field == m.focusField {
|
||||||
|
index = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// if the field is not found, return
|
||||||
|
if index == -1 {
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// if the field is the last one, and we have params selected go to the param fields
|
||||||
|
if !m.inParamsFields && index == len(m.Fields)-1 && len(selectedParamFields) > 0 {
|
||||||
|
m.focusField.Blur()
|
||||||
|
m.inParamsFields = true
|
||||||
|
paramsFields := selectedParamFields
|
||||||
|
m.focusField = paramsFields[0]
|
||||||
|
m.focusField.Focus()
|
||||||
|
|
||||||
|
// if the field is the last one, and we have params selected go to the first non params field
|
||||||
|
} else if m.inParamsFields && index == len(selectedParamFields)-1 {
|
||||||
|
m.focusField.Blur()
|
||||||
|
m.inParamsFields = false
|
||||||
|
m.focusField = m.Fields[0]
|
||||||
|
m.focusField.Focus()
|
||||||
|
|
||||||
|
// if not in the params fields and the field is the last one, go to the first one
|
||||||
|
} else if index == len(m.Fields)-1 && !m.inParamsFields {
|
||||||
|
m.focusField.Blur()
|
||||||
|
m.focusField = m.Fields[0]
|
||||||
|
m.focusField.Focus()
|
||||||
|
} else {
|
||||||
|
// otherwise, go to the next field
|
||||||
|
m.focusField.Blur()
|
||||||
|
if m.inParamsFields {
|
||||||
|
m.focusField = selectedParamFields[index+1]
|
||||||
|
} else {
|
||||||
|
m.focusField = m.Fields[index+1]
|
||||||
|
}
|
||||||
|
m.focusField.Focus()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "ctrl+c", "esc":
|
||||||
|
return m, tea.Quit
|
||||||
|
case "enter":
|
||||||
|
return m, nil
|
||||||
|
default:
|
||||||
|
if m.focusField != nil {
|
||||||
|
md, cmd := m.focusField.(huh.Field).Update(msg)
|
||||||
|
|
||||||
|
if md != nil {
|
||||||
|
m.focusField = md.(huh.Field)
|
||||||
|
}
|
||||||
|
|
||||||
|
return m, cmd
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
71
interactive/view.go
Normal file
71
interactive/view.go
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
package interactive
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/charmbracelet/bubbles/key"
|
||||||
|
"github.com/charmbracelet/lipgloss"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (m Model) View() string {
|
||||||
|
|
||||||
|
fieldStyle := lipgloss.NewStyle().PaddingBottom(1)
|
||||||
|
|
||||||
|
if m.err != nil {
|
||||||
|
return lipgloss.
|
||||||
|
NewStyle().
|
||||||
|
Bold(true).
|
||||||
|
Foreground(lipgloss.Color("red")).
|
||||||
|
Background(lipgloss.Color("black")).
|
||||||
|
Render("Error: " + m.err.Error() + "\n" + "Press Ctrl+C to exit.")
|
||||||
|
}
|
||||||
|
|
||||||
|
output := lipgloss.NewStyle().
|
||||||
|
Foreground(lipgloss.Color("5")).
|
||||||
|
PaddingBottom(1).
|
||||||
|
Bold(true).
|
||||||
|
Underline(true).
|
||||||
|
Render("Welcome to the img-proxy URL Generator!") + "\n"
|
||||||
|
|
||||||
|
for _, field := range m.Fields {
|
||||||
|
output += fieldStyle.Render("\n" + field.View())
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, field := range *m.selectedParams {
|
||||||
|
for _, f := range field.Input() {
|
||||||
|
output += fieldStyle.Render("\n" + f.View())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if *m.url == "" {
|
||||||
|
return output + "\n" + m.renderHelp()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate the URL
|
||||||
|
params := make([]string, 0)
|
||||||
|
for _, field := range *m.selectedParams {
|
||||||
|
if field.Value() != "" {
|
||||||
|
params = append(params, field.Key()+":"+field.Value())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
url, _ := m.generator.GenerateUrl(*m.url, params, *m.format)
|
||||||
|
|
||||||
|
output += fmt.Sprintf("\nGenerated URL: %s\n\n", lipgloss.NewStyle().
|
||||||
|
Bold(true).
|
||||||
|
Foreground(lipgloss.Color("#0000ff")).
|
||||||
|
Render(url))
|
||||||
|
|
||||||
|
output += m.renderHelp()
|
||||||
|
|
||||||
|
return output
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m Model) renderHelp() string {
|
||||||
|
return m.help.ShortHelpView([]key.Binding{
|
||||||
|
key.NewBinding(key.WithKeys("ctrl+c", "esc"), key.WithHelp("esc", "quit")),
|
||||||
|
key.NewBinding(key.WithKeys("up"), key.WithHelp("↑", "cursor up")),
|
||||||
|
key.NewBinding(key.WithKeys("down"), key.WithHelp("↓", "cursor down")),
|
||||||
|
key.NewBinding(key.WithKeys(" "), key.WithHelp("space", "select")),
|
||||||
|
key.NewBinding(key.WithKeys("tab"), key.WithHelp("tab", "next field")),
|
||||||
|
})
|
||||||
|
}
|
||||||
261
main.go
261
main.go
@@ -1,109 +1,32 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
cliCommands "github.com/siteworxpro/img-proxy-url-generator/commands"
|
||||||
"fmt"
|
|
||||||
"github.com/bigkevmcd/go-configparser"
|
|
||||||
"github.com/siteworxpro/img-proxy-url-generator/aws"
|
|
||||||
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
|
||||||
"github.com/siteworxpro/img-proxy-url-generator/printer"
|
"github.com/siteworxpro/img-proxy-url-generator/printer"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"html/template"
|
|
||||||
"log"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var keyBin, saltBin []byte
|
|
||||||
|
|
||||||
var imgGenerator *generator.Generator
|
|
||||||
|
|
||||||
var Version = "v0.0.0"
|
var Version = "v0.0.0"
|
||||||
|
|
||||||
var awsConfig aws.Config
|
|
||||||
|
|
||||||
type jsonRequest struct {
|
|
||||||
Image string `json:"image"`
|
|
||||||
Params []string `json:"params"`
|
|
||||||
Format string `json:"format"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
pr := printer.NewPrinter()
|
pr := printer.NewPrinter()
|
||||||
|
|
||||||
var commands []*cli.Command
|
var commands []*cli.Command
|
||||||
|
commands = append(commands, cliCommands.GenerateCommand())
|
||||||
commands = append(commands, &cli.Command{
|
commands = append(commands, cliCommands.ServerCommand())
|
||||||
Name: "generate",
|
commands = append(commands, cliCommands.ReportCommand())
|
||||||
Usage: "Generate an image from a URL",
|
commands = append(commands, cliCommands.GrpcCommand())
|
||||||
Action: func(c *cli.Context) error {
|
commands = append(commands, cliCommands.DecryptCommand())
|
||||||
return run(c, pr)
|
commands = append(commands, cliCommands.Interactive())
|
||||||
},
|
|
||||||
Flags: []cli.Flag{
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "image",
|
|
||||||
Aliases: []string{"i"},
|
|
||||||
Required: true,
|
|
||||||
},
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "format",
|
|
||||||
Aliases: []string{"f"},
|
|
||||||
Usage: "Convert the image to the specified format",
|
|
||||||
},
|
|
||||||
&cli.StringSliceFlag{
|
|
||||||
Name: "params",
|
|
||||||
Aliases: []string{"p"},
|
|
||||||
Usage: "Processing options to be passed to the generator ref: https://docs.imgproxy.net/usage/processing",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
commands = append(commands, &cli.Command{
|
|
||||||
Name: "server",
|
|
||||||
Usage: "Start a webserver for s3 file browsing",
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
return startServer(c, pr)
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
commands = append(commands, &cli.Command{
|
|
||||||
Name: "decrypt",
|
|
||||||
Usage: "decrypt an image url contents",
|
|
||||||
Flags: []cli.Flag{
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "url",
|
|
||||||
Aliases: []string{"u"},
|
|
||||||
Required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
err := initGenerator(c.String("config"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
plain, err := imgGenerator.Decrypt(c.String("url"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
pr.LogSuccess(plain)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
app := &cli.App{
|
app := &cli.App{
|
||||||
Name: "img-proxy-url-generator",
|
Name: "img-proxy-url-generator",
|
||||||
Usage: "URL Generator for the img proxy service",
|
Usage: "URL Generator for the img proxy service",
|
||||||
DefaultCommand: "generate",
|
DefaultCommand: "interactive",
|
||||||
Version: Version,
|
Version: Version,
|
||||||
Commands: commands,
|
Commands: commands,
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
return run(c, pr)
|
|
||||||
},
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
Name: "config",
|
Name: "config",
|
||||||
@@ -121,171 +44,3 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func startServer(c *cli.Context, p *printer.Printer) error {
|
|
||||||
err := initGenerator(c.String("config"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = os.Stat("./templates")
|
|
||||||
if !os.IsNotExist(err) {
|
|
||||||
awsClient := aws.NewClient(&awsConfig)
|
|
||||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
contToken := r.URL.Query().Get("next")
|
|
||||||
|
|
||||||
var next *string
|
|
||||||
if contToken == "" {
|
|
||||||
next = nil
|
|
||||||
} else {
|
|
||||||
next = &contToken
|
|
||||||
}
|
|
||||||
|
|
||||||
contents, err := awsClient.ListBucketContents(next)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, content := range contents.Images {
|
|
||||||
contents.Images[i].Url, _ = signURL("s3://"+awsConfig.Bucket+"/"+content.Name, []string{"pr:sq"}, "")
|
|
||||||
contents.Images[i].Download, _ = signURL("s3://"+awsConfig.Bucket+"/"+content.Name, []string{""}, "")
|
|
||||||
}
|
|
||||||
|
|
||||||
file, _ := os.ReadFile("./templates/index.gohtml")
|
|
||||||
|
|
||||||
tmpl := template.Must(template.New("index").Parse(string(file)))
|
|
||||||
|
|
||||||
err = tmpl.Execute(w, contents)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
println(err.Error())
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
http.HandleFunc("/generate", func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.Method != "POST" {
|
|
||||||
w.WriteHeader(404)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
bodyContents := make([]byte, r.ContentLength)
|
|
||||||
_, _ = r.Body.Read(bodyContents)
|
|
||||||
|
|
||||||
jr := jsonRequest{}
|
|
||||||
err = json.Unmarshal(bodyContents, &jr)
|
|
||||||
if err != nil {
|
|
||||||
println(err.Error())
|
|
||||||
w.WriteHeader(500)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
url, err := signURL(jr.Image, jr.Params, jr.Format)
|
|
||||||
if err != nil {
|
|
||||||
println(err.Error())
|
|
||||||
w.WriteHeader(500)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println(fmt.Sprintf("%s - [%s] - (%s)", jr.Image, strings.Join(jr.Params, ","), url))
|
|
||||||
|
|
||||||
_, _ = w.Write([]byte(url))
|
|
||||||
})
|
|
||||||
|
|
||||||
p.LogSuccess("Starting http server on port 8080. http://localhost:8080")
|
|
||||||
log.Fatal(http.ListenAndServe("0.0.0.0:8080", nil))
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func run(c *cli.Context, p *printer.Printer) error {
|
|
||||||
err := initGenerator(c.String("config"))
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
url, err := signURL(c.String("image"), c.StringSlice("params"), c.String("format"))
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
p.LogInfo("Url Generated...")
|
|
||||||
|
|
||||||
println(url)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func initGenerator(config string) error {
|
|
||||||
var err error
|
|
||||||
|
|
||||||
if config == "" {
|
|
||||||
config = "imgproxy.cfg"
|
|
||||||
}
|
|
||||||
|
|
||||||
p, err := configparser.NewConfigParserFromFile(config)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !p.HasSection("img-proxy") {
|
|
||||||
return fmt.Errorf("config error - [img-proxy] config required")
|
|
||||||
}
|
|
||||||
|
|
||||||
config, err = p.Get("img-proxy", "key")
|
|
||||||
if config != "" {
|
|
||||||
keyBin = []byte(config)
|
|
||||||
}
|
|
||||||
|
|
||||||
config, err = p.Get("img-proxy", "salt")
|
|
||||||
saltBin = []byte(config)
|
|
||||||
|
|
||||||
hostConf, err := p.Get("img-proxy", "host")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
plainConfig, err := p.Get("img-proxy", "plain-url")
|
|
||||||
|
|
||||||
encKey, err := p.Get("img-proxy", "encryption-key")
|
|
||||||
|
|
||||||
generatorConfig := generator.Config{
|
|
||||||
Salt: saltBin,
|
|
||||||
Key: keyBin,
|
|
||||||
Host: hostConf,
|
|
||||||
EncryptionKey: &encKey,
|
|
||||||
PlainUrl: plainConfig != "",
|
|
||||||
}
|
|
||||||
|
|
||||||
imgGenerator, err = generator.NewGenerator(generatorConfig)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if p.HasSection("aws") {
|
|
||||||
awsConfig.AwsSecret, _ = p.Get("aws", "secret")
|
|
||||||
awsConfig.AwsKey, _ = p.Get("aws", "key")
|
|
||||||
awsConfig.AwsRole, _ = p.Get("aws", "role")
|
|
||||||
awsConfig.Bucket, _ = p.Get("aws", "bucket")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func signURL(file string, params []string, formatS string) (string, error) {
|
|
||||||
format, err := imgGenerator.StringToFormat(formatS)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
url, err := imgGenerator.GenerateUrl(file, params, format)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return url, nil
|
|
||||||
}
|
|
||||||
|
|||||||
65
redis/client.go
Normal file
65
redis/client.go
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
package redis
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Redis struct {
|
||||||
|
initialized redisStatus
|
||||||
|
client *redis.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
type redisStatus uint8
|
||||||
|
|
||||||
|
const (
|
||||||
|
redisStatusUninitialized redisStatus = iota
|
||||||
|
redisStatusInitialized
|
||||||
|
)
|
||||||
|
|
||||||
|
var singleton *Redis
|
||||||
|
|
||||||
|
func New(config *config.Config) (*Redis, error) {
|
||||||
|
if singleton != nil && singleton.initialized == redisStatusUninitialized {
|
||||||
|
return singleton, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
db, err := strconv.ParseInt(config.Redis.DB, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
db = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
port := config.Redis.Port
|
||||||
|
if port == "" {
|
||||||
|
port = "6379"
|
||||||
|
}
|
||||||
|
|
||||||
|
rdb := redis.NewClient(&redis.Options{
|
||||||
|
Addr: fmt.Sprintf("%s:%s", config.Redis.Host, port),
|
||||||
|
DB: int(db),
|
||||||
|
Password: config.Redis.Password,
|
||||||
|
})
|
||||||
|
|
||||||
|
_, err = rdb.Ping(context.Background()).Result()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to connect to redis: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
singleton = &Redis{
|
||||||
|
initialized: redisStatusInitialized,
|
||||||
|
client: rdb,
|
||||||
|
}
|
||||||
|
|
||||||
|
return singleton, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Redis) GetClient() *redis.Client {
|
||||||
|
return r.client
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Redis) Close() error {
|
||||||
|
return r.client.Close()
|
||||||
|
}
|
||||||
75
report/command.go
Normal file
75
report/command.go
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
package report
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"github.com/charmbracelet/lipgloss"
|
||||||
|
"github.com/charmbracelet/lipgloss/table"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/aws"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/generator"
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/redis"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const lastAccessKey = "imgproxy:%s:last_access"
|
||||||
|
const requestsKey = "imgproxy:%s:requests"
|
||||||
|
|
||||||
|
var rowStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#FFFFFF"))
|
||||||
|
var headerStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#FFFFFF")).Bold(true)
|
||||||
|
|
||||||
|
func Handle(config *config.Config) error {
|
||||||
|
a := aws.NewClient(config)
|
||||||
|
r, err := redis.New(config)
|
||||||
|
ig, err := generator.NewGenerator(config)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var continuationToken *string
|
||||||
|
list, err := a.ListBucketContents(continuationToken)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var rows [][]string
|
||||||
|
for list.StartAfter != "" {
|
||||||
|
for _, image := range list.Images {
|
||||||
|
dlUrl, err := ig.GenerateUrl(image.S3Path, []string{}, generator.DEF)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
lastAccessedS, err := r.GetClient().Get(context.Background(), fmt.Sprintf(lastAccessKey, image.S3Path)).Result()
|
||||||
|
lastAccessedI, _ := strconv.ParseInt(lastAccessedS, 10, 64)
|
||||||
|
lastAccessed := time.Unix(lastAccessedI, 0)
|
||||||
|
requestsCount, err := r.GetClient().Get(context.Background(), fmt.Sprintf(requestsKey, image.S3Path)).Result()
|
||||||
|
|
||||||
|
rows = append(rows, []string{image.S3Path, requestsCount, lastAccessed.Format(time.DateTime), dlUrl})
|
||||||
|
}
|
||||||
|
|
||||||
|
continuationToken = &list.StartAfter
|
||||||
|
list, err = a.ListBucketContents(continuationToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
// sort by last accessed
|
||||||
|
sort.Slice(rows, func(i, j int) bool {
|
||||||
|
return rows[i][2] > rows[j][2]
|
||||||
|
})
|
||||||
|
|
||||||
|
t := table.New().StyleFunc(func(row int, col int) lipgloss.Style {
|
||||||
|
switch {
|
||||||
|
case row == 0:
|
||||||
|
return headerStyle
|
||||||
|
default:
|
||||||
|
return rowStyle
|
||||||
|
}
|
||||||
|
}).
|
||||||
|
Headers("Image", "Times Accessed", "Last Accessed", "URL").
|
||||||
|
Rows(rows...)
|
||||||
|
|
||||||
|
fmt.Println(t)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user