Fix #52: Duplicate command fails with 504 timeout

docs/releases.md

@@ -1,6 +1,12 @@
 # Release notes 
 
-## Release next
+## Release 0.7.0
+
+### Fix #52: Duplicate command fails with 504 timeout
+A new option enable the possibility of calling directly the immich-server once it's port is published.
+
+`-api URL` URL of the Immich api endpoint (http://container_ip:3301)<br>
+
 
 ### Fix #50:  Duplicate detection fails when timezone of both images differs
 Imported duplicated images with same name, but different timezone wasn't seen as duplicates.

immich/call_test.go

@@ -68,11 +68,12 @@ func TestCall(t *testing.T) {
 			server := httptest.NewServer(&tst.server)
 			defer server.Close()
 			ctx := context.Background()
-			ic, err := NewImmichClient(server.URL, "1234", "tester", true)
+			ic, err := NewImmichClient(server.URL, "1234")
 			if err != nil {
 				t.Fail()
 				return
 			}
+			ic.EnableAppTrace(true)
 			r := map[string]string{}
 			err = ic.newServerCall(ctx, tst.name).do(tst.requestFn, responseJSON(&r))
 			if tst.expectedErr && err == nil {

immich/client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"os"
 	"time"
 )
 
@@ -23,16 +24,36 @@ type ImmichClient struct {
 	ApiTrace     bool
 }
 
+func (ic *ImmichClient) SetEndPoint(endPoint string) *ImmichClient {
+	ic.endPoint = endPoint
+	return ic
+}
+
+func (ic *ImmichClient) SetDeviceUUID(deviceUUID string) *ImmichClient {
+	ic.DeviceUUID = deviceUUID
+	return ic
+}
+
+func (ic *ImmichClient) EnableAppTrace(state bool) *ImmichClient {
+	ic.ApiTrace = state
+	return ic
+}
+
 // Create a new ImmichClient
-func NewImmichClient(endPoint, key, deviceUUID string, apiTrace bool) (*ImmichClient, error) {
+func NewImmichClient(endPoint string, key string) (*ImmichClient, error) {
+	var err error
+	deviceUUID, err := os.Hostname()
+	if err != nil {
+		return nil, err
+	}
+
 	ic := ImmichClient{
 		endPoint:     endPoint + "/api",
 		key:          key,
 		client:       &http.Client{},
 		DeviceUUID:   deviceUUID,
 		Retries:      1,
 		RetriesDelay: time.Second * 1,
-		ApiTrace:     apiTrace,
 	}
 	return &ic, nil
 }

main.go

@@ -52,16 +52,18 @@ func main() {
 }
 
 type Application struct {
-	EndPoint   string               // Immich server address (http://<your-ip>:2283/api or https://<your-domain>/api)
-	Key        string               // API Key
-	DeviceUUID string               // Set a device UUID
-	Immich     *immich.ImmichClient // Immich client
-	Logger     *logger.Logger       // Program's logger
-	ApiTrace   bool
-
-	NoLogColors bool // Disable log colors
-	LogLevel    string
-	Debug       bool
+	Server      string // Immich server address (http://<your-ip>:2283/api or https://<your-domain>/api)
+	API         string // Immich api endpoint (http://container_ip:3301)
+	Key         string // API Key
+	DeviceUUID  string // Set a device UUID
+	ApiTrace    bool   // Enable API call traces
+	NoLogColors bool   // Disable log colors
+	LogLevel    string // Idicate the log level
+	Debug       bool   // Enable the debug mode
+
+	Immich *immich.ImmichClient // Immich client
+	Logger *logger.Logger       // Program's logger
+
 }
 
 func Run(ctx context.Context, log *logger.Logger) (*logger.Logger, error) {
@@ -72,16 +74,21 @@ func Run(ctx context.Context, log *logger.Logger) (*logger.Logger, error) {
 	}
 
 	app := Application{}
-	flag.StringVar(&app.EndPoint, "server", "", "Immich server address (http://<your-ip>:2283 or https://<your-domain>)")
+	flag.StringVar(&app.Server, "server", "", "Immich server address (http://<your-ip>:2283 or https://<your-domain>)")
+	flag.StringVar(&app.API, "api", "", "Immich api endpoint (http://container_ip:3301)")
 	flag.StringVar(&app.Key, "key", "", "API Key")
 	flag.StringVar(&app.DeviceUUID, "device-uuid", deviceID, "Set a device UUID")
 	flag.BoolVar(&app.NoLogColors, "no-colors-log", false, "Disable colors on logs")
 	flag.StringVar(&app.LogLevel, "log-level", "ok", "Log level (Error|Warning|OK|Info), default OK")
 	flag.BoolVar(&app.ApiTrace, "api-trace", false, "enable api call traces")
 	flag.BoolVar(&app.Debug, "debug", false, "enable debug messages")
 	flag.Parse()
-	if len(app.EndPoint) == 0 {
-		err = errors.Join(err, errors.New("missing -server"))
+
+	switch {
+	case len(app.Server) == 0 && len(app.API) == 0:
+		err = errors.Join(err, errors.New("missing -server, Immich server address (http://<your-ip>:2283 or https://<your-domain>)"))
+	case len(app.Server) > 0 && len(app.API) > 0:
+		err = errors.Join(err, errors.New("give either the -server or the -api option"))
 	}
 	if len(app.Key) == 0 {
 		err = errors.Join(err, errors.New("missing -key"))
@@ -93,7 +100,7 @@ func Run(ctx context.Context, log *logger.Logger) (*logger.Logger, error) {
 	}
 
 	if len(flag.Args()) == 0 {
-		err = errors.Join(err, errors.New("missing command"))
+		err = errors.Join(err, errors.New("missing command upload|duplicate|stack"))
 	}
 
 	app.Logger = logger.NewLogger(logLevel, app.NoLogColors, app.Debug)
@@ -102,10 +109,16 @@ func Run(ctx context.Context, log *logger.Logger) (*logger.Logger, error) {
 		return app.Logger, err
 	}
 
-	app.Immich, err = immich.NewImmichClient(app.EndPoint, app.Key, app.DeviceUUID, app.ApiTrace)
+	app.Immich, err = immich.NewImmichClient(app.Server, app.Key)
 	if err != nil {
 		return app.Logger, err
 	}
+	if app.API != "" {
+		app.Immich.SetEndPoint(app.API)
+	}
+	if app.ApiTrace {
+		app.Immich.EnableAppTrace(true)
+	}
 
 	err = app.Immich.PingServer(ctx)
 	if err != nil {

readme.md

@@ -34,6 +34,8 @@ immich-go -server URL -key KEY -general_options COMMAND -command_options... {fil
 ```
 
 `-server URL` URL of the Immich service, example http://<your-ip>:2283 or https://your-domain<br>
+`-api URL` URL of the Immich api endpoint (http://container_ip:3301)<br>
+
 `-key KEY` A key generated by the user. Uploaded photos will belong to the key's owner.<br>
 `-no-colors-log` Remove color codes from logs.<br>
 `-log-level` Adjust the log verbosity as follow: (Default OK)