Caddyfile

@@ -0,0 +1,41 @@
+# 1. Garage Web Admin UI
+garage-ui.yiem.cc {
+    reverse_proxy 192.168.88.106:3909
+}
+
+# 2. Garage S3 API (Path-Style & Single Domain)
+s3-api.yiem.cc {
+    # CORS: handle OPTIONS preflight
+    @options method OPTIONS {
+        header Access-Control-Request-Method *
+    }
+    handle @options {
+        respond * 204
+    }
+    # CORS headers on all responses
+    header {
+        Access-Control-Allow-Origin "*"
+        Access-Control-Allow-Methods "GET, PUT, POST, DELETE, OPTIONS"
+        Access-Control-Allow-Headers "*"
+        Access-Control-Max-Age "86400"
+    }
+    reverse_proxy 192.168.88.106:3900 {
+        header_up Host {host}
+    }
+}
+
+# 3. Garage S3 WEB (Path-Style & Single Domain)
+s3-web.yiem.cc {
+    # /bucket -> /bucket/
+    @bucket_root path_regexp bucket_root ^/([^/]+)$
+    redir @bucket_root /{http.regexp.bucket_root.1}/ 301
+
+    # /bucket/... -> Garage
+    @bucket path_regexp bucket ^/([^/]+)(/.*)?$
+
+    rewrite @bucket {http.regexp.bucket.2}
+
+    reverse_proxy 192.168.88.106:3902 {
+        header_up Host {http.regexp.bucket.1}.s3-web.yiem.cc
+    }
+}

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.12.7"
 manifest_format = "2.0"
-project_hash = "92e6bf163bcece135b000f14dcd39dd92d77a044"
+project_hash = "c54613132b678b04efd2a70a95fabd5b0cdd02a2"
 
 [[deps.AWS]]
 deps = ["Base64", "Compat", "Dates", "Downloads", "GitHub", "HTTP", "IniFile", "JSON", "MD5", "Mocking", "OrderedCollections", "Random", "SHA", "ScopedValues", "Sockets", "URIs", "UUIDs", "XMLDict"]

Project.toml

@@ -1,11 +1,12 @@
 name = "GeneralUtils"
 uuid = "c6c72f09-b708-4ac8-ac7c-2084d70108fe"
-version = "0.6.9"
+version = "0.6.10"
-authors = ["tonaerospace <tonaerospace.etc@gmail.com>"]
+authors = ["tonaerospace <tonaerospace.etc@gmail.com"]
 
 [deps]
 AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
 AWSS3 = "1c724243-ef5b-51ab-93f4-b0a88ac62a95"
+Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -15,6 +16,7 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LibPQ = "194296ae-ab2e-5f79-8cd4-7183a0a5a0d1"
+MbedTLS = "739be429-bea8-5141-9913-cc70e7f3736d"
 NATS = "55e73f9c-eeeb-467f-b4cc-a633fde63d2a"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 PrettyPrinting = "54e16d92-306c-5ea0-a30b-337be88ac337"
@@ -28,10 +30,12 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 AWS = "1.99.0"
 AWSS3 = "0.11.6"
+Base64 = "1.11.0"
 Graphs = "1.14.0"
 HTTP = "2.5.0 - 2.9.9"
 JSON = "1.3.0 - 1.9.9"
 LibPQ = "1.18.0"
+MbedTLS = "1.1.10"
 NATS = "0.1.0"
 OrderedCollections = "2.0.1"
 Revise = "3.13.2"

garage.toml

@@ -0,0 +1,52 @@
+# ==========================================
+# Garage Storage Engine Configuration
+# ==========================================
+
+# Core storage directories
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+
+# LMDB is recommended for production performance
+db_engine = "lmdb"
+metadata_auto_snapshot_interval = "6h"
+
+# Multi-node ready setup:
+# Set to 1 for initial single node. Update to 3 when adding Node 2 and Node 3 later.
+replication_factor = 1
+compression_level = 2
+
+# ==========================================
+# Network & Node Identity Configuration
+# ==========================================
+
+# Bind to all interfaces for host network mode
+rpc_bind_addr = "[::]:3901"
+
+# IMPORTANT: Set to Node 1's publicly reachable IP or DNS name (e.g., 192.168.1.10:3901 or 203.0.113.10:3901)
+rpc_public_addr = "192.168.88.106:3901"
+
+# Generate with: openssl rand -hex 32 (MUST BE IDENTICAL ON ALL NODES IN CLUSTER)
+rpc_secret = "3cf7a4d1da5d7b024a06db7fe6d73e2c160c6de640fda69b0b964d98678155a7"
+
+# ==========================================
+# Service APIs
+# ==========================================
+
+[s3_api]
+s3_region = "garage"
+api_bind_addr = "0.0.0.0:3900"
+root_domain = ".s3-api.yiem.cc"
+
+[s3_web]
+bind_addr = "0.0.0.0:3902"
+root_domain = ".s3-web.yiem.cc"
+index = "index.html"
+
+[k2v_api]
+api_bind_addr = "0.0.0.0:3904"
+
+[admin]
+api_bind_addr = "0.0.0.0:3903"
+# Generate with: openssl rand -hex 16
+admin_token = "fd92f47a7c1ce8b072b06bb19dbc3fef"
+metrics_token = "27d29618cc436a23ec7d842392fdf74b"

garage_docker-compose.yml

@@ -0,0 +1,48 @@
+services:
+  garage:
+    image: dxflrs/garage:v2.3.0
+    container_name: garage
+    restart: unless-stopped
+    network_mode: "host"
+    volumes:
+      - ./garage.toml:/etc/garage.toml:ro
+      - garage_meta:/var/lib/garage/meta
+      - garage_data:/var/lib/garage/data
+    environment:
+      - RUST_LOG=garage=trace
+    healthcheck:
+      test: ["CMD", "/garage", "status"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+
+  webui:
+    image: khairul169/garage-webui:latest
+    container_name: garage-webui
+    restart: unless-stopped
+    network_mode: "host"
+    volumes:
+      - ./garage.toml:/etc/garage.toml:ro
+    environment:
+      API_BASE_URL: "http://127.0.0.1:3903"
+      S3_ENDPOINT_URL: "https://s3-api.yiem.cc"
+      # Format: "username:bcrypt_hash" (generate via: htpasswd -nbBC 10 "admin" "yourpassword")
+      AUTH_USER_PASS: "admin:$$2y$$10$$fhEucJHW8N5p8NL7Gv4Bi.FZVngbq/zatVDCjl.V.xNtj5q1PNUZW"
+    depends_on:
+      garage:
+        condition: service_healthy
+
+volumes:
+  garage_meta:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: ./data/meta
+  garage_data:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: ./data/storage

my_AI_prompt.md

@@ -0,0 +1,147 @@
+This is my frontend code folder: /home/ton/docker-apps/sommpanion/agent-frontend/ 
+
+Log from my frontend browser console:
+[NATS] Requesting from: sommpanion.5c1c85ad_44f8_49a7_a9a5_b7a7dface0db.agentBackend.v1.inbox payload: {"correlation_id":"5c1c85ad-44f8-49a7-a9a5-b7a7dface0db","msg_id":"FCA61ED2C63C4EDBB179378CEA010421","timestamp":"2026-09-05T11:44:52.208Z","send_to":"sommpanion.5c1c85ad_44f8_49a7_a9a5_b7a7dface0db.agentBackend.v1.inbox","msg_purpose":"chat","sender_name":"chat-webapp","sender_id":"5c1c85ad-44f8-49a7-a9a5-b7a7dface0db","receiver_name":"","receiver_id":"","reply_to":"sommpanion.frontend.agentfrontend.v1.inbox.5c1c85ad-44f8-49a7-a9a5-b7a7dface0db","reply_to_msg_id":"","broker_url":"wss://natsws.yiem.cc","metadata":{},"payloads":[{"id":"25F52E33F1284B58B4D76454C4DA2E96","dataname":"msg","payload_type":"dictionary","transport":"direct","encoding":"base64","size":97,"data":"eyJyb2xlIjoidXNlciIsImNvbnRlbnQiOlt7InR5cGUiOiJ0ZXh0IiwidGV4dCI6ImRvIHlvdSBoYXZlIHJlZCB3aW5lIGZyb20gRnJhbmNlIHVuZGVyIDEwMDA/In1dfQ==","metadata":{"payload_bytes":97}}]}
+natsClient.js:44 [NATS] Status event: pingTimer 1
+natsClient.js:174 [NATS] Request response: {broker_url: 'nats.yiem.cc', correlation_id: 'b9ebec8b-a4e3-432e-895d-8a099d92a5d1', metadata: {…}, msg_id: '860671db_fb1b_456f_a00f_c787c915e208', msg_purpose: 'chat', …}broker_url: "nats.yiem.cc"correlation_id: "b9ebec8b-a4e3-432e-895d-8a099d92a5d1"metadata: [[Prototype]]: Objectmsg_id: "860671db_fb1b_456f_a00f_c787c915e208"msg_purpose: "chat"payloads: Array(1)0: data: "https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf"dataname: "reply"encoding: "none"id: "13e9a0c4-fc4c-4d95-a9e0-6a9ae1f8219d"payload_type: "dictionary"size: 162786transport: "link"[[Prototype]]: Objectconstructor: ƒ Object()hasOwnProperty: ƒ hasOwnProperty()isPrototypeOf: ƒ isPrototypeOf()propertyIsEnumerable: ƒ propertyIsEnumerable()toLocaleString: ƒ toLocaleString()toString: ƒ toString()valueOf: ƒ valueOf()__defineGetter__: ƒ __defineGetter__()__defineSetter__: ƒ __defineSetter__()__lookupGetter__: ƒ __lookupGetter__()__lookupSetter__: ƒ __lookupSetter__()__proto__: (...)get __proto__: ƒ __proto__()set __proto__: ƒ __proto__()length: 1[[Prototype]]: Array(0)at: ƒ at()concat: ƒ concat()constructor: ƒ Array()copyWithin: ƒ copyWithin()entries: ƒ entries()every: ƒ every()fill: ƒ fill()filter: ƒ filter()find: ƒ find()findIndex: ƒ findIndex()findLast: ƒ findLast()findLastIndex: ƒ findLastIndex()flat: ƒ flat()flatMap: ƒ flatMap()forEach: ƒ forEach()includes: ƒ (item, from_index)indexOf: ƒ (item, from_index)join: ƒ join()keys: ƒ keys()lastIndexOf: ƒ (item, from_index)length: 0map: ƒ map()pop: ƒ pop()push: ƒ push()reduce: ƒ reduce()reduceRight: ƒ reduceRight()reverse: ƒ reverse()shift: ƒ shift()slice: ƒ slice()some: ƒ some()sort: ƒ sort()splice: ƒ splice()toLocaleString: ƒ toLocaleString()toReversed: ƒ toReversed()toSorted: ƒ toSorted()toSpliced: ƒ toSpliced()toString: ƒ toString()unshift: ƒ unshift()values: ƒ values()with: ƒ with()Symbol(Symbol.iterator): ƒ values()Symbol(Symbol.unscopables): {at: true, copyWithin: true, entries: true, fill: true, find: true, …}[[Prototype]]: Objectreceiver_id: ""receiver_name: ""reply_to: ""reply_to_msg_id: "FCA61ED2C63C4EDBB179378CEA010421"send_to: "_INBOX.P79XUSKPYH9E88Z9RM5QA1.P79XUSKPYH9E88Z9RM5QIN"sender_id: "828ef5e5-5d8e-47e2-8c48-736d99375af7"sender_name: "sommpanion_agent_backend"timestamp: "2026-09-05T18:47:37.858"[[Prototype]]: Object
+msghandler-csr.js:95 [2026-09-05T11:47:36.857Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Processing received message
+msghandler-csr.js:95 [2026-09-05T11:47:36.857Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] smartunpack: envelope has 1 payloads
+msghandler-csr.js:95 [2026-09-05T11:47:36.857Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] smartunpack: Processing 1 payloads
+msghandler-csr.js:95 [2026-09-05T11:47:36.858Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] smartunpack: Processing payload 1/1: dataname=reply, type=dictionary, transport=link
+msghandler-csr.js:95 [2026-09-05T11:47:36.858Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Link transport - fetching 'reply' from URL: https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf
+:5173/#chat:1 Access to fetch at 'https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf' from origin 'http://localhost:5173' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.
+msghandler-csr.js:274  GET https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf net::ERR_FAILED 200 (OK)
+fetchWithBackoff @ msghandler-csr.js:274
+smartunpack @ msghandler-csr.js:582
+processIncomingMessage @ Chat.svelte:136
+handleSend @ Chat.svelte:301
+await in handleSend
+handleSend @ ChatInput.svelte:21
+handleKeydown @ ChatInput.svelte:34
+handle_event_propagation @ events.js:278
+msghandler-csr.js:95 [2026-09-05T11:47:36.962Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Attempt 1 failed: TypeError - Failed to fetch
+:5173/#chat:1 Access to fetch at 'https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf' from origin 'http://localhost:5173' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.
+msghandler-csr.js:274  GET https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf net::ERR_FAILED 200 (OK)
+fetchWithBackoff @ msghandler-csr.js:274
+await in fetchWithBackoff
+smartunpack @ msghandler-csr.js:582
+processIncomingMessage @ Chat.svelte:136
+handleSend @ Chat.svelte:301
+await in handleSend
+handleSend @ ChatInput.svelte:21
+handleKeydown @ ChatInput.svelte:34
+handle_event_propagation @ events.js:278
+msghandler-csr.js:95 [2026-09-05T11:47:37.110Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Attempt 2 failed: TypeError - Failed to fetch
+:5173/#chat:1 Access to fetch at 'https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf' from origin 'http://localhost:5173' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.
+msghandler-csr.js:274  GET https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf net::ERR_FAILED 200 (OK)
+fetchWithBackoff @ msghandler-csr.js:274
+await in fetchWithBackoff
+smartunpack @ msghandler-csr.js:582
+processIncomingMessage @ Chat.svelte:136
+handleSend @ Chat.svelte:301
+await in handleSend
+handleSend @ ChatInput.svelte:21
+handleKeydown @ ChatInput.svelte:34
+handle_event_propagation @ events.js:278
+msghandler-csr.js:95 [2026-09-05T11:47:37.359Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Attempt 3 failed: TypeError - Failed to fetch
+:5173/#chat:1 Access to fetch at 'https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf' from origin 'http://localhost:5173' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.
+msghandler-csr.js:274  GET https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf net::ERR_FAILED 200 (OK)
+fetchWithBackoff @ msghandler-csr.js:274
+await in fetchWithBackoff
+smartunpack @ msghandler-csr.js:582
+processIncomingMessage @ Chat.svelte:136
+handleSend @ Chat.svelte:301
+await in handleSend
+handleSend @ ChatInput.svelte:21
+handleKeydown @ ChatInput.svelte:34
+handle_event_propagation @ events.js:278
+msghandler-csr.js:95 [2026-09-05T11:47:37.801Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Attempt 4 failed: TypeError - Failed to fetch
+:5173/#chat:1 Access to fetch at 'https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf' from origin 'http://localhost:5173' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource.
+msghandler-csr.js:274  GET https://s3-api.yiem.cc/sommpanion/reply?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T114737Z&X-Amz-SignedHeaders=host&X-Amz-Signature=d5249d804b46114baf6e6436e2f8d8a22bc362422373a601de03ce8606edbbbf net::ERR_FAILED 200 (OK)
+fetchWithBackoff @ msghandler-csr.js:274
+await in fetchWithBackoff
+smartunpack @ msghandler-csr.js:582
+processIncomingMessage @ Chat.svelte:136
+handleSend @ Chat.svelte:301
+await in handleSend
+handleSend @ ChatInput.svelte:21
+handleKeydown @ ChatInput.svelte:34
+handle_event_propagation @ events.js:278
+msghandler-csr.js:95 [2026-09-05T11:47:38.641Z] [Correlation: b9ebec8b-a4e3-432e-895d-8a099d92a5d1] Attempt 5 failed: TypeError - Failed to fetch
+Chat.svelte:162 Failed to process incoming message Error: Failed to fetch data after 5 attempts
+    at fetchWithBackoff (msghandler-csr.js:293:11)
+    at async Object.smartunpack (msghandler-csr.js:582:36)
+    at async Module.track_reactivity_loss (async.js:179:14)
+    at async processIncomingMessage (Chat.svelte:136:12)
+
+Here is my backend log folder: 
+/home/ton/docker-apps/sommpanion/agent-backend/log/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/garageS3.jl

@@ -2,12 +2,18 @@ module garageS3
 
 export
     LifecycleExpiration, build_lifecycle_xml,
-    GarageStorage, put_file, get_file, list_files, delete_file,
+    GarageStorage, s3PutFile, s3GetFile, s3ListFiles, s3DeleteFile,
-    set_lifecycle_expiration, get_lifecycle, delete_lifecycle
+    s3SetLifecycleExpiration, s3GetLifecycle, s3DeleteLifecycle,
+    s3SignUrl, s3SignUrlWeb
 
 using AWS 
 @service S3
 using AWSS3
+using Dates: Dates
+using URIs: URIs
+using OrderedCollections: OrderedDict
+using MbedTLS: digest, MD_SHA256
+using Base64: bytes2hex
 # ---------------------------------------------- 100 --------------------------------------------- #
 
 # Garage uses Path-Style routing (https://s3-api.my-domain.com/bucket/key).
@@ -18,13 +24,13 @@ storage1 = GeneralUtils.GarageStorage(
   "https://s3-api.yiem.cc",
   "GKb080154a2e5b19100b1b2c6e",     # key ID  (create at garage-ui.yiem.cc)
   "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",   # key ID's secret key
-  "testbucket"
+  "sommpanion"
 )
 
 # Safe to run inside concurrent HTTP handlers (e.g., Oxygen.jl, HTTP.jl)
 # use UUID as filename because GarageS3 requires unique filename for each uploaded object
-urls = GeneralUtils.put_file(storage1, "transferjob-(GeneralUtils.uuid4snakecase())", "{\"status\": \"inactive\"}")
+urls = GeneralUtils.s3PutFile(storage1, "transferjob-(GeneralUtils.uuid4snakecase())", "{\"status\": \"inactive\"}")
-key = GeneralUtils.list_files(storage)
+key = GeneralUtils.s3ListFiles(storage)
 
 println("Read back: ", data)
 println("Bucket keys: ", key)
@@ -35,7 +41,7 @@ curl -v \
   http://192.168.88.106:3902/users-1002.json
 
 # test with API
-data = String(GeneralUtils.get_file(storage, key[1]))
+data = String(GeneralUtils.s3GetFile(storage, key[1]))
 
 # test with a browser (urls.web)
 https://s3-web.mydomain.com/my_bucket_name/users-1005.json
@@ -137,8 +143,8 @@ end
 # Examples
 ```jldoctest
 julia> storage1 = GarageStorage("https://s3-api.yiem.cc", "GKb08015", "55114ff94828febca1", "sommpanion-s3")
-julia> put_file1 = put_file(storage1)
+julia> s3PutFile1 = s3PutFile(storage1)
-julia> downloadUrl = put_file1("test.json", "{\"status\": \"active\"}")
+julia> downloadUrl = s3PutFile1("test.json", "{\"status\": \"active\"}")
 Successfully uploaded:  test.json
 julia> downloadUrl.api
 "https://s3-api.yiem.cc/sommpanion-s3/test.json"
@@ -146,10 +152,10 @@ julia> downloadUrl.web
 "https://s3-web.yiem.cc/sommpanion-s3/test.json"
 ```
 """
-mutable struct put_file
+mutable struct s3PutFile
   storage::GarageStorage
 end
-function (pf::put_file)(key::String, data::Union{String, Vector{UInt8}}
+function (pf::s3PutFile)(key::String, data::Union{String, Vector{UInt8}}
   )::NamedTuple{(:api, :web), Tuple{String, String}}
   AWSS3.s3_put(pf.storage.config, pf.storage.bucket, key, data)
   println("Successfully uploaded: ", key)
@@ -178,7 +184,7 @@ end
 
 # Examples
 ```julia
-julia> result = put_file(storage, "test.json", "{\"status\": \"active\"}")
+julia> result = s3PutFile(storage, "test.json", "{\"status\": \"active\"}")
 Successfully uploaded:  test.json
 julia> result.api
 "https://s3-api.yiem.cc/sommpanion-s3/test.json"
@@ -186,7 +192,7 @@ julia> result.web
 "https://s3-web.yiem.cc/sommpanion-s3/test.json"
 ```
 """
-function put_file(storage::GarageStorage, key::String, data::Union{String, Vector{UInt8}}
+function s3PutFile(storage::GarageStorage, key::String, data::Union{String, Vector{UInt8}}
   )::NamedTuple{(:api, :web), Tuple{String, String}}
   AWSS3.s3_put(storage.config, storage.bucket, key, data)
   println("Successfully uploaded: ", key)
@@ -213,13 +219,13 @@ end
 
 # Examples
 ```julia
-julia> data = String(get_file(storage, "test.json"))
+julia> data = String(s3GetFile(storage, "test.json"))
 "\"{\\\"status\\\": \\\"active\\\"}\""
 ```
 """
-function get_file(storage::GarageStorage, key::String)::Union{Vector{UInt8}, Nothing}
+function s3GetFile(storage::GarageStorage, key::String)::Union{Vector{UInt8}, Nothing}
     try
-        return AWSS3.s3_get(storage.config, storage.bucket, key)
+        return AWSS3.s3_get(storage.config, storage.bucket, key; raw=true)
     catch
         return nothing
     end
@@ -236,14 +242,14 @@ end
 
 # Examples
 ```julia
-julia> keys = list_files(storage)
+julia> keys = s3ListFiles(storage)
 3-element Vector{String}:
  "test1.json"
  "test2.json"
  "users-1002.json"
 ```
 """
-function list_files(storage::GarageStorage)
+function s3ListFiles(storage::GarageStorage)
     # Use delimiter="" to get all individual keys (no grouping by "directory")
     objects = AWSS3.s3_list_objects(storage.config, storage.bucket; delimiter="")
     return [obj["Key"] for obj in objects]
@@ -259,13 +265,196 @@ end
 
 # Examples
 ```julia
-julia> delete_file(storage, "test.json")
+julia> s3DeleteFile(storage, "test.json")
 ```
 """
-function delete_file(storage::GarageStorage, key::String)
+function s3DeleteFile(storage::GarageStorage, key::String)
     AWSS3.s3_delete(storage.config, storage.bucket, key)
 end
 
+"""
+    s3SignUrl(storage, key, seconds=3600; verb="GET", content_type="application/octet-stream", signature_version="v4") -> String
+
+Generate a pre-signed URL for an object in the Garage S3 bucket.
+
+A pre-signed URL grants temporary access without AWS credentials. Signature is computed
+using AWS Signature Version 4 (HMAC-SHA256).
+
+# Arguments
+- `storage::GarageStorage`: Storage client from `GarageStorage(endpoint, key, secret, bucket)`.
+- `key::String`: Object key. Supports nested paths like `"folder/subfolder/file.txt"`.
+- `seconds::Int`: URL validity in seconds. Default: 3600.
+
+# Keyword Arguments
+- `verb::String = "GET"`: HTTP method (`"GET"` downloads, `"PUT"` uploads).
+- `content_type::String = "application/octet-stream"`: Required `Content-Type` header.
+  For PUT, set to the file's MIME type (`"image/png"`, `"application/json"`, etc.).
+- `signature_version::String = "v4"`: Always use `"v4"` (v2 is deprecated).
+
+# Return
+`String`: The pre-signed URL.
+
+# Examples
+
+```julia
+using GeneralUtils: GarageStorage, s3SignUrl, s3ListFiles, s3PutFile
+
+storage = GarageStorage(
+  "https://s3-api.yiem.cc",
+  "GKb080154a2e5b19100b1b2c6e",
+  "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+  "sommpanion"
+)
+
+# Upload — PUT with curl
+url = s3SignUrl(storage, "photo.jpg", 3600; verb="PUT", content_type="image/jpeg")
+# curl -X PUT -T "/path/to/photo.jpg" -H 'Host: s3-api.yiem.cc' -H 'Content-Type: image/jpeg' <url>
+
+# Download — GET with curl
+url = s3SignUrl(storage, "photo.jpg", 3600; verb="GET")
+# curl <url>  → returns file content
+
+# Upload JSON
+url = s3SignUrl(storage, "data/config.json", 3600; verb="PUT", content_type="application/json")
+# curl -X PUT -T "/tmp/config.json" -H 'Host: s3-api.yiem.cc' -H 'Content-Type: application/json' <url>
+
+# Delete
+url = s3SignUrl(storage, "photo.jpg", 3600; verb="DELETE")
+# curl -X DELETE url
+
+# Multiple uploads (chat app)
+urls = [s3SignUrl(storage, "chat/\$(GeneralUtils.uuid4snakecase())", 300;
+                     verb="PUT", content_type="image/png")
+        for _ in 1:10]
+
+# Signature differs by verb and content_type
+url_get = s3SignUrl(storage, "file.txt", 3600; verb="GET")
+url_put = s3SignUrl(storage, "file.txt", 3600; verb="PUT", content_type="text/plain")
+```
+
+# Notes
+- URLs are valid until `seconds` expires; they can be used **multiple times** (not one-time).
+- Server clocks must be within ~5 minutes of the Garage server (UTC time in signature).
+- PUT uploads require the client's `Content-Type` to match `content_type`.
+- For browser CORS uploads, configure Garage bucket CORS rules for `Origin` and `Method`.
+"""
+function s3SignUrl(
+    storage::GarageStorage,
+    key::String,
+    seconds::Int=3600;
+    verb::String="GET",
+    content_type::String="application/octet-stream",
+    signature_version::String="v4",
+)::String
+    config = storage.config
+    creds = config.credentials
+    bucket = storage.bucket
+    region = config.region
+    endpoint = strip(config.endpoint, '/')
+    scheme = "AWS4"
+    algorithm = "HMAC-SHA256"
+    terminator = "aws4_request"
+    service = "s3"
+
+    now_datetime = Dates.now(Dates.UTC)
+    datetime_stamp = Dates.format(now_datetime, "YYYYmmddTHHMMSS\\Z")
+    date_stamp = Dates.format(now_datetime, "YYYYmmdd")
+
+    scope = "$date_stamp/$region/$service/$terminator"
+
+    headers = OrderedDict{String,String}("Host" => URIs.URI(endpoint).host)
+    if verb == "PUT"
+        headers["Content-Type"] = content_type
+    end
+    sort!(headers; by=name -> lowercase(name))
+    canonical_header_names = join(map(name -> lowercase(name), collect(keys(headers))), ";")
+
+    query = OrderedDict{String,String}(
+        "X-Amz-Expires" => string(seconds),
+        "X-Amz-Algorithm" => "$scheme-$algorithm",
+        "X-Amz-Credential" => "$(creds.access_key_id)/$scope",
+        "X-Amz-Date" => datetime_stamp,
+        "X-Amz-SignedHeaders" => canonical_header_names,
+    )
+    if !isempty(creds.token)
+        query["X-Amz-Security-Token"] = creds.token
+    end
+
+    canonical_headers = join(
+        map(
+            header -> "$(lowercase(header.first)):$(lowercase(header.second))\n",
+            collect(headers),
+        ),
+    )
+
+    resource_path = "/$bucket/$key"
+
+    # Build canonical query string: sort by key=value pair lexicographically,
+    # URL-encoding each key and value (matching Garage's uri_encode)
+    sorted_q = sort(
+        [URIs.escapeuri(k) * "=" * URIs.escapeuri(v) for (k, v) in pairs(query)],
+        by=lowercase,
+    )
+    canonical_query = join(sorted_q, "&")
+
+    canonical_request = string(
+        "$verb\n",
+        resource_path,
+        "\n",
+        canonical_query,
+        "\n",
+        canonical_headers,
+        "\n",
+        canonical_header_names,
+        "\n",
+        "UNSIGNED-PAYLOAD",
+    )
+
+    string_to_sign = string(
+        "$scheme-$algorithm\n",
+        "$datetime_stamp\n",
+        "$scope\n",
+        bytes2hex(digest(MD_SHA256, canonical_request)),
+    )
+
+    key_secret_bytes = Vector{UInt8}(string(scheme, creds.secret_key))
+    key_date = digest(MD_SHA256, date_stamp, key_secret_bytes)
+    key_region = digest(MD_SHA256, region, key_date)
+    key_service = digest(MD_SHA256, service, key_region)
+    key_signing = digest(MD_SHA256, terminator, key_service)
+    signature = digest(MD_SHA256, string_to_sign, key_signing)
+
+    query["X-Amz-Signature"] = bytes2hex(signature)
+
+    query_string = URIs.escapeuri(query)
+    return "$(endpoint)/$bucket/$key?$query_string"
+end
+
+""" Generate a pre-signed URL using the Garage S3 web endpoint (s3-web).
+
+Useful for direct browser access — URLs look like
+`https://s3-web.yiem.cc/bucket/key?X-Amz-Signature=...`
+
+Arguments and keyword arguments are the same as `s3SignUrl`.
+"""
+function s3SignUrlWeb(
+    storage::GarageStorage,
+    key::String,
+    seconds::Int=3600;
+    verb::String="GET",
+    content_type::String="application/octet-stream",
+    signature_version::String="v4",
+)::String
+    web_endpoint = replace(storage.config.endpoint, "s3-api" => "s3-web")
+    web_creds = SimpleCredentials(
+        storage.config.credentials.access_key_id,
+        storage.config.credentials.secret_key,
+        storage.config.credentials.token,
+    )
+    web_config = GarageConfig(web_endpoint, storage.config.region, web_creds)
+    web_storage = GarageStorage(web_config, storage.bucket)
+    return s3SignUrl(web_storage, key, seconds; verb, content_type, signature_version)
+end
 
 # ===================================================================
 # 3. Bucket Lifecycle Configuration
@@ -323,10 +512,10 @@ end
 # Example
 ```julia
 rule = LifecycleExpiration("uploads/", 30)
-set_lifecycle_expiration(storage, rule)
+s3SetLifecycleExpiration(storage, rule)
 ```
 """
-function set_lifecycle_expiration(storage::GarageStorage, rule::LifecycleExpiration)
+function s3SetLifecycleExpiration(storage::GarageStorage, rule::LifecycleExpiration)
     xml_body = build_lifecycle_xml(rule)
     args = Dict{String,Any}("body" => xml_body)
     return S3.put_bucket_lifecycle_configuration(storage.bucket, args; aws_config=storage.config)
@@ -342,10 +531,10 @@ end
 
 # Example
 ```julia
-config = get_lifecycle(storage)
+config = s3GetLifecycle(storage)
 ```
 """
-function get_lifecycle(storage::GarageStorage)::Union{Dict{String,Any},Nothing}
+function s3GetLifecycle(storage::GarageStorage)::Union{Dict{String,Any},Nothing}
     try
         return S3.get_bucket_lifecycle_configuration(storage.bucket; aws_config=storage.config)
     catch e
@@ -366,10 +555,10 @@ end
 
 # Example
 ```julia
-delete_lifecycle(storage)
+s3DeleteLifecycle(storage)
 ```
 """
-function delete_lifecycle(storage::GarageStorage)
+function s3DeleteLifecycle(storage::GarageStorage)
     return S3.delete_bucket_lifecycle(storage.bucket; aws_config=storage.config)
 end
 

test/etc.jl

@@ -0,0 +1,130 @@
+curl -X PUT -H "Content-Type: application/json" \
+  -d '{"test": "data"}' \
+  "https://s3-api.yiem.cc/sommpanion/pcimage.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T103745Z&X-Amz-Expires=300&X-Amz-Security-Token=&X-Amz-SignedHeaders=host&X-Amz-Signature=0e195a48f824a2f8ffcb06461396cd6a8bddd5b61d93e9006f947ae10ecf525f"
+
+
+
+
+
+
+
+
+
+curl -v -X PUT -T "/home/ton/docker-apps/sommpanion/etc/GeneralUtils/photo.jpg" \
+  -H 'Host: s3-api.yiem.cc' \
+  -H 'Content-Type: image/jpeg' \
+  "https://s3-api.yiem.cc/sommpanion/photo.jpg?X-Amz-Expires=300&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260905%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260905T030315Z&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=1107a31f36f8b8ceb9663d69b9a7be7733df14d019e700e750944cbdad50df5d"
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+read
+./garage.toml
+./Caddyfile
+./src/garageS3.jl
+
+
+
+julia> url = GeneralUtils.s3_sign_url(storage1, "photo.jpg", 36000; verb="PUT", content_type="image/jpeg")
+"https://s3-api.yiem.cc/sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T145004Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=92cd634dbb0f66db4b8b039ef5939c138203de260e8342fe27ef78979d90a824"
+
+---
+
+
+
+
+
+
+
+
+
+
+
+ton@server12vm-dev:~/docker-apps/sommpanion/etc/AWS.jl$ 
+curl -v -X PUT -T "/home/ton/docker-apps/sommpanion/etc/GeneralUtils/photo.jpg" \
+  -H 'Host: s3-api.yiem.cc' \
+  -H 'Content-Type: image/jpeg' \
+  "https://s3-api.yiem.cc/sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T152217Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=7eb874abb813427a71beab956514c3a0539cacf765013aa194be8517dd081f02"
+
+Note: Unnecessary use of -X or --request, PUT is already inferred.
+*   Trying 110.77.160.154:443...
+* Connected to s3-api.yiem.cc (110.77.160.154) port 443 (#0)
+* ALPN: offers h2,http/1.1
+* TLSv1.3 (OUT), TLS handshake, Client hello (1):
+*  CAfile: /etc/ssl/certs/ca-certificates.crt
+*  CApath: /etc/ssl/certs
+* TLSv1.3 (IN), TLS handshake, Server hello (2):
+* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
+* TLSv1.3 (IN), TLS handshake, Certificate (11):
+* TLSv1.3 (IN), TLS handshake, CERT verify (15):
+* TLSv1.3 (IN), TLS handshake, Finished (20):
+* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
+* TLSv1.3 (OUT), TLS handshake, Finished (20):
+* SSL connection using TLSv1.3 / TLS_CHACHA20_POLY1305_SHA256
+* ALPN: server accepted h2
+* Server certificate:
+*  subject: CN=s3-api.yiem.cc
+*  start date: Aug 27 04:27:02 2026 GMT
+*  expire date: Nov 25 04:27:01 2026 GMT
+*  subjectAltName: host "s3-api.yiem.cc" matched cert's "s3-api.yiem.cc"
+*  issuer: C=US; O=Let's Encrypt; CN=YE2
+*  SSL certificate verify ok.
+* using HTTP/2
+* h2h3 [:method: PUT]
+* h2h3 [:path: /sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T152217Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=7eb874abb813427a71beab956514c3a0539cacf765013aa194be8517dd081f02]
+* h2h3 [:scheme: https]
+* h2h3 [:authority: s3-api.yiem.cc]
+* h2h3 [user-agent: curl/7.88.1]
+* h2h3 [accept: */*]
+* h2h3 [content-type: image/jpeg]
+* h2h3 [content-length: 439490]
+* Using Stream ID: 1 (easy handle 0x559a08824c80)
+> PUT /sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T152217Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=7eb874abb813427a71beab956514c3a0539cacf765013aa194be8517dd081f02 HTTP/2
+> Host: s3-api.yiem.cc
+> user-agent: curl/7.88.1
+> accept: */*
+> content-type: image/jpeg
+> content-length: 439490
+> 
+* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
+* We are completely uploaded and fine
+< HTTP/2 403 
+< access-control-allow-origin: *
+< alt-svc: h3=":443"; ma=2592000
+< content-type: application/xml
+< date: Fri, 04 Sep 2026 15:23:13 GMT
+< via: 1.1 Caddy
+< content-length: 190
+< 
+* Connection #0 to host s3-api.yiem.cc left intact
+<?xml version="1.0" encoding="UTF-8"?><Error><Code>AccessDenied</Code><Message>Forbidden: Invalid signature</Message><Resource>/sommpanion/photo.jpg</Resource><Region>garage</Region></Error>
+
+2026-09-04T15:23:13.796037Z  INFO garage_api_common::generic_server: 110.77.160.154 (via 192.168.88.21:57926) PUT /sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T152217Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=7eb874abb813427a71beab956514c3a0539cacf765013aa194be8517dd081f02
+2026-09-04T15:23:13.796077Z DEBUG garage_api_common::generic_server: Request { method: PUT, uri: /sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T152217Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=7eb874abb813427a71beab956514c3a0539cacf765013aa194be8517dd081f02, version: HTTP/1.1, headers: {"host": "s3-api.yiem.cc", "user-agent": "curl/7.88.1", "content-length": "439490", "accept": "*/*", "content-type": "image/jpeg", "via": "2.0 Caddy", "x-forwarded-for": "110.77.160.154", "x-forwarded-host": "s3-api.yiem.cc", "x-forwarded-proto": "https", "accept-encoding": "gzip"}, body: Body(Streaming) }
+2026-09-04T15:23:13.796181Z DEBUG garage_api_common::generic_server: Endpoint: PutObject
+2026-09-04T15:23:13.796461Z  INFO garage_api_common::generic_server: error 403 Forbidden, Forbidden: Invalid signature in response to 110.77.160.154 (via 192.168.88.21:57926) PUT /sommpanion/photo.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=GKb080154a2e5b19100b1b2c6e%2F20260904%2Fgarage%2Fs3%2Faws4_request&X-Amz-Date=20260904T152217Z&X-Amz-Expires=36000&X-Amz-SignedHeaders=content-type%3Bhost&X-Amz-Signature=7eb874abb813427a71beab956514c3a0539cacf765013aa194be8517dd081f02
+
+
+
+
+
+
+
+
+
+
+
+
+

test/runtests.jl

@@ -1,9 +1,7 @@
 using Test
 using GeneralUtils
 using GeneralUtils.garageS3
-using AWS
+using HTTP
-using Random: randstring
-using UUIDs: uuid4
 
 @testset "garageS3.jl" begin
 
@@ -18,10 +16,10 @@ using UUIDs: uuid4
 
     @testset "SimpleCredentials AWS extensions" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key1", "secret1", "token1")
-        @test AWS.credentials(creds) === creds
+        @test GeneralUtils.garageS3.AWS.credentials(creds) === creds
-        @test AWS.check_credentials(creds) === creds
+        @test GeneralUtils.garageS3.AWS.check_credentials(creds) === creds
-        @test AWS.refresh!(creds; force=false) === creds
+        @test GeneralUtils.garageS3.AWS.refresh!(creds; force=false) === creds
-        @test AWS.refresh!(creds) === creds
+        @test GeneralUtils.garageS3.AWS.refresh!(creds) === creds
     end
 
     # --- GarageConfig ---
@@ -32,57 +30,57 @@ using UUIDs: uuid4
         @test config.endpoint == "https://s3-api.example.com"
         @test config.region == "us-east-1"
         @test config.credentials === creds
-        @test config isa AWS.AbstractAWSConfig
+        @test config isa GeneralUtils.garageS3.AWS.AbstractAWSConfig
     end
 
     @testset "GarageConfig AWS extensions" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("https://s3-api.example.com", "garage", creds)
-        @test AWS.region(config) == "garage"
+        @test GeneralUtils.garageS3.AWS.region(config) == "garage"
-        @test AWS.credentials(config) === creds
+        @test GeneralUtils.garageS3.AWS.credentials(config) === creds
     end
 
-    # --- AWS.generate_service_url ---
+    # --- GeneralUtils.garageS3.AWS.generate_service_url ---
 
     @testset "generate_service_url with resource starting with /" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("https://s3-api.example.com", "garage", creds)
-        url = AWS.generate_service_url(config, "s3", "/mybucket/key")
+        url = GeneralUtils.garageS3.AWS.generate_service_url(config, "s3", "/mybucket/key")
         @test url == "https://s3-api.example.com/mybucket/key"
     end
 
     @testset "generate_service_url with resource NOT starting with /" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("https://s3-api.example.com", "garage", creds)
-        url = AWS.generate_service_url(config, "s3", "mybucket/key")
+        url = GeneralUtils.garageS3.AWS.generate_service_url(config, "s3", "mybucket/key")
         @test url == "https://s3-api.example.com/mybucket/key"
     end
 
     @testset "generate_service_url strips trailing slashes from endpoint" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("https://s3-api.example.com/", "garage", creds)
-        url = AWS.generate_service_url(config, "s3", "/bucket/key")
+        url = GeneralUtils.garageS3.AWS.generate_service_url(config, "s3", "/bucket/key")
         @test url == "https://s3-api.example.com/bucket/key"
     end
 
     @testset "generate_service_url with multiple trailing slashes" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("https://s3-api.example.com///", "garage", creds)
-        url = AWS.generate_service_url(config, "s3", "/bucket/key")
+        url = GeneralUtils.garageS3.AWS.generate_service_url(config, "s3", "/bucket/key")
         @test url == "https://s3-api.example.com/bucket/key"
     end
 
     @testset "generate_service_url preserves http endpoint" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("http://localhost:3900", "garage", creds)
-        url = AWS.generate_service_url(config, "s3", "/bucket/key")
+        url = GeneralUtils.garageS3.AWS.generate_service_url(config, "s3", "/bucket/key")
         @test url == "http://localhost:3900/bucket/key"
     end
 
     @testset "generate_service_url with http endpoint and trailing slash" begin
         creds = GeneralUtils.garageS3.SimpleCredentials("key", "secret", "")
         config = GeneralUtils.garageS3.GarageConfig("http://localhost:3900/", "garage", creds)
-        url = AWS.generate_service_url(config, "s3", "/bucket/key")
+        url = GeneralUtils.garageS3.AWS.generate_service_url(config, "s3", "/bucket/key")
         @test url == "http://localhost:3900/bucket/key"
     end
 
@@ -118,17 +116,17 @@ using UUIDs: uuid4
         @test storage isa GarageStorage
     end
 
-    # --- put_file callable struct ---
+    # --- s3PutFile callable struct ---
 
-    @testset "put_file callable struct type is correct" begin
+    @testset "s3PutFile callable struct type is correct" begin
         storage = GarageStorage("https://s3-api.example.com", "key", "secret", "bucket")
-        uploader = put_file(storage)
+        uploader = s3PutFile(storage)
-        @test uploader isa put_file
+        @test uploader isa s3PutFile
     end
 
-    @testset "put_file callable struct construction stores storage" begin
+    @testset "s3PutFile callable struct construction stores storage" begin
         storage = GarageStorage("https://s3-api.example.com", "key", "secret", "bucket")
-        uploader = put_file(storage)
+        uploader = s3PutFile(storage)
         @test uploader.storage === storage
     end
 
@@ -142,11 +140,11 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "testrunner-$(randstring(8)).json"
+        test_key = "testrunner-$(GeneralUtils.uuid4snakecase()).json"
         test_data = "{\"status\": \"testing\", \"runner\": \"runtests\"}"
 
-        # Test put_file(storage, key, data) - successful upload
+        # Test s3PutFile(storage, key, data) - successful upload
-        result = put_file(storage, test_key, test_data)
+        result = s3PutFile(storage, test_key, test_data)
         @test result !== nothing
         @test haskey(result, :api)
         @test haskey(result, :web)
@@ -154,35 +152,35 @@ using UUIDs: uuid4
         @test occursin("s3-api", result.api)
         @test occursin("s3-web", result.web)
 
-        # Test get_file - retrieve the uploaded data
+        # Test s3GetFile - retrieve the uploaded data
-        downloaded = get_file(storage, test_key)
+        downloaded = s3GetFile(storage, test_key)
         @test downloaded !== nothing
         @test downloaded isa Vector{UInt8}
         @test String(downloaded) == test_data
 
-        # Test list_files - verify key appears in listing
+        # Test s3ListFiles - verify key appears in listing
-        keys = list_files(storage)
+        keys = s3ListFiles(storage)
         @test test_key in keys
 
-        # Test put_file callable struct
+        # Test s3PutFile callable struct
-        test_key2 = "testrunner-callable-$(randstring(8)).json"
+        test_key2 = "testrunner-callable-$(GeneralUtils.uuid4snakecase()).json"
-        callable_result = put_file(storage)(test_key2, "callable-data")
+        callable_result = s3PutFile(storage)(test_key2, "callable-data")
         @test callable_result !== nothing
         @test callable_result.api != ""
         @test callable_result.web != ""
 
         # Verify callable upload
-        downloaded2 = get_file(storage, test_key2)
+        downloaded2 = s3GetFile(storage, test_key2)
         @test String(downloaded2) == "callable-data"
 
-        # Test delete_file
+        # Test s3DeleteFile
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
-        deleted_data = get_file(storage, test_key)
+        deleted_data = s3GetFile(storage, test_key)
         @test deleted_data === nothing
 
         # Cleanup callable test object
-        delete_file(storage, test_key2)
+        s3DeleteFile(storage, test_key2)
-        deleted_data2 = get_file(storage, test_key2)
+        deleted_data2 = s3GetFile(storage, test_key2)
         @test deleted_data2 === nothing
     end
 
@@ -194,11 +192,11 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "single/slash/test-$(randstring(8)).json"
+        test_key = "single/slash/test-$(GeneralUtils.uuid4snakecase()).json"
         test_data = "{\"level\": 1, \"nested\": true}"
 
         # Upload nested key
-        result = put_file(storage, test_key, test_data)
+        result = s3PutFile(storage, test_key, test_data)
         @test result isa NamedTuple
         @test haskey(result, :api)
         @test haskey(result, :web)
@@ -206,17 +204,17 @@ using UUIDs: uuid4
         @test occursin("single/slash/", result.web)
 
         # Download and verify
-        downloaded = get_file(storage, test_key)
+        downloaded = s3GetFile(storage, test_key)
         @test downloaded !== nothing
         @test String(downloaded) == test_data
 
         # Verify in listing
-        keys = list_files(storage)
+        keys = s3ListFiles(storage)
         @test test_key in keys
 
         # Delete and verify gone
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
-        @test get_file(storage, test_key) === nothing
+        @test s3GetFile(storage, test_key) === nothing
     end
 
     @testset "integration: nested key CRUD - multi level" begin
@@ -227,28 +225,28 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "deep/nested/folder/subfolder/test-$(randstring(8)).json"
+        test_key = "deep/nested/folder/subfolder/test-$(GeneralUtils.uuid4snakecase()).json"
         test_data = "{\"deeply\": \"nested\", \"path\": \"deep/nested/folder/subfolder/\"}"
 
         # Upload deeply nested key
-        result = put_file(storage, test_key, test_data)
+        result = s3PutFile(storage, test_key, test_data)
         @test result isa NamedTuple
         @test occursin("deep/nested/folder/subfolder/", result.api)
         @test occursin("s3-api", result.api)
         @test occursin("s3-web", result.web)
 
         # Download and verify
-        downloaded = get_file(storage, test_key)
+        downloaded = s3GetFile(storage, test_key)
         @test downloaded !== nothing
         @test String(downloaded) == test_data
 
         # Verify in listing
-        keys = list_files(storage)
+        keys = s3ListFiles(storage)
         @test test_key in keys
 
         # Delete and verify gone
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
-        @test get_file(storage, test_key) === nothing
+        @test s3GetFile(storage, test_key) === nothing
     end
 
     @testset "integration: nested key with callable struct" begin
@@ -259,29 +257,29 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "callable/nested/test-$(randstring(8)).json"
+        test_key = "callable/nested/test-$(GeneralUtils.uuid4snakecase()).json"
         test_data = "{\"callable\": true, \"nested\": true}"
 
-        uploader = put_file(storage)
+        uploader = s3PutFile(storage)
         result = uploader(test_key, test_data)
         @test result isa NamedTuple
         @test occursin("callable/nested/", result.api)
 
-        downloaded = get_file(storage, test_key)
+        downloaded = s3GetFile(storage, test_key)
         @test String(downloaded) == test_data
 
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
-        @test get_file(storage, test_key) === nothing
+        @test s3GetFile(storage, test_key) === nothing
     end
 
-    @testset "integration: get_file returns nothing for missing key" begin
+    @testset "integration: s3GetFile returns nothing for missing key" begin
         storage = GarageStorage(
             "https://s3-api.yiem.cc",
             "GKb080154a2e5b19100b1b2c6e",
             "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
             "testbucket"
         )
-        result = get_file(storage, "nonexistent-key-$(randstring(8)).json")
+        result = s3GetFile(storage, "nonexistent-key-$(GeneralUtils.uuid4snakecase()).json")
         @test result === nothing
     end
 
@@ -293,20 +291,20 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "testrunner-binary-$(randstring(8)).bin"
+        test_key = "testrunner-binary-$(GeneralUtils.uuid4snakecase()).bin"
         binary_data = UInt8[0x00, 0x01, 0x02, 0xFF, 0xFE, 0xFD, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
 
-        result = put_file(storage, test_key, binary_data)
+        result = s3PutFile(storage, test_key, binary_data)
         @test result !== nothing
 
-        downloaded = get_file(storage, test_key)
+        downloaded = s3GetFile(storage, test_key)
         @test downloaded == binary_data
 
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
-        @test get_file(storage, test_key) === nothing
+        @test s3GetFile(storage, test_key) === nothing
     end
 
-    @testset "integration: list_files returns vector of strings" begin
+    @testset "integration: s3ListFiles returns vector of strings" begin
         storage = GarageStorage(
             "https://s3-api.yiem.cc",
             "GKb080154a2e5b19100b1b2c6e",
@@ -314,14 +312,14 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "testrunner-list-$(randstring(8)).txt"
+        test_key = "testrunner-list-$(GeneralUtils.uuid4snakecase()).txt"
-        put_file(storage, test_key, "list-test-data")
+        s3PutFile(storage, test_key, "list-test-data")
 
-        keys = list_files(storage)
+        keys = s3ListFiles(storage)
         @test keys isa Vector{String}
         @test test_key in keys
 
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
     end
 
     @testset "integration: url format validation" begin
@@ -332,15 +330,15 @@ using UUIDs: uuid4
             "testbucket"
         )
 
-        test_key = "testrunner-url-$(randstring(8)).json"
+        test_key = "testrunner-url-$(GeneralUtils.uuid4snakecase()).json"
-        result = put_file(storage, test_key, "url-test")
+        result = s3PutFile(storage, test_key, "url-test")
 
         @test startswith(result.api, "https://s3-api.yiem.cc/testbucket/")
         @test occursin("/$test_key", result.api)
         @test startswith(result.web, "https://s3-web.yiem.cc/testbucket/")
         @test occursin("/$test_key", result.web)
 
-        delete_file(storage, test_key)
+        s3DeleteFile(storage, test_key)
     end
 
     # --- Lifecycle configuration tests ---
@@ -398,23 +396,23 @@ using UUIDs: uuid4
         )
 
         # Should return nothing when no lifecycle is set
-        lc = get_lifecycle(storage)
+        lc = s3GetLifecycle(storage)
         @test lc === nothing
 
         # Set lifecycle
         rule = LifecycleExpiration("lifecycle-test/", 45)
-        set_lifecycle_expiration(storage, rule)
+        s3SetLifecycleExpiration(storage, rule)
 
         # Should return configuration after setting
-        lc = get_lifecycle(storage)
+        lc = s3GetLifecycle(storage)
         @test lc !== nothing
         @test haskey(lc, "Rule")
 
         # Delete lifecycle
-        delete_lifecycle(storage)
+        s3DeleteLifecycle(storage)
 
         # Should return nothing after deletion
-        lc = get_lifecycle(storage)
+        lc = s3GetLifecycle(storage)
         @test lc === nothing
     end
 
@@ -427,14 +425,14 @@ using UUIDs: uuid4
         )
 
         rule = LifecycleExpiration("a/b/c/", 20; id="nested-rule")
-        set_lifecycle_expiration(storage, rule)
+        s3SetLifecycleExpiration(storage, rule)
 
-        lc = get_lifecycle(storage)
+        lc = s3GetLifecycle(storage)
         @test lc !== nothing
         @test haskey(lc, "Rule")
 
-        delete_lifecycle(storage)
+        s3DeleteLifecycle(storage)
-        @test get_lifecycle(storage) === nothing
+        @test s3GetLifecycle(storage) === nothing
     end
 
     @testset "integration: lifecycle enabled/disabled toggle" begin
@@ -447,17 +445,249 @@ using UUIDs: uuid4
 
         # Set enabled rule
         rule1 = LifecycleExpiration("toggle/", 10; enabled=true)
-        set_lifecycle_expiration(storage, rule1)
+        s3SetLifecycleExpiration(storage, rule1)
-        lc = get_lifecycle(storage)
+        lc = s3GetLifecycle(storage)
         @test lc !== nothing
 
         # Override with disabled rule
         rule2 = LifecycleExpiration("toggle/", 10; enabled=false)
-        set_lifecycle_expiration(storage, rule2)
+        s3SetLifecycleExpiration(storage, rule2)
-        lc = get_lifecycle(storage)
+        lc = s3GetLifecycle(storage)
         @test lc !== nothing
 
-        delete_lifecycle(storage)
+        s3DeleteLifecycle(storage)
+    end
+
+    # --- Pre-signed URL tests ---
+
+    @testset "s3SignUrl returns a string" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url = s3SignUrl(storage, "test.json", 3600)
+        @test url isa String
+        @test !isempty(url)
+    end
+
+    @testset "s3SignUrl URL format contains correct endpoint, bucket, key" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url = s3SignUrl(storage, "mykey.json", 1800)
+        @test occursin("https://s3-api.yiem.cc", url)
+        @test occursin("/testbucket/mykey.json?", url)
+    end
+
+    @testset "s3SignUrl contains required query parameters" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url = s3SignUrl(storage, "test.json", 3600)
+        @test occursin("X-Amz-Algorithm=AWS4-HMAC-SHA256", url)
+        @test occursin("X-Amz-Expires=3600", url)
+        @test occursin("X-Amz-Credential=", url)
+        @test occursin("X-Amz-Date=", url)
+        @test occursin("X-Amz-SignedHeaders=", url)
+        @test occursin("X-Amz-Signature=", url)
+    end
+
+    @testset "s3SignUrl with custom expiry duration" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url = s3SignUrl(storage, "test.json", 600)
+        @test occursin("X-Amz-Expires=600", url)
+    end
+
+    @testset "s3SignUrl with GET verb produces different signature than default" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url_get = s3SignUrl(storage, "test.json", 3600; verb="GET")
+        url_default = s3SignUrl(storage, "test.json", 3600)
+        @test occursin("X-Amz-Signature=", url_get)
+        @test occursin("X-Amz-Signature=", url_default)
+        @test occursin("X-Amz-Algorithm=AWS4-HMAC-SHA256", url_get)
+    end
+
+    @testset "s3SignUrl with PUT verb and content_type" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url_put = s3SignUrl(storage, "upload.json", 300; verb="PUT", content_type="application/json")
+        url_get = s3SignUrl(storage, "upload.json", 300; verb="GET")
+        @test occursin("X-Amz-Signature=", url_put)
+        @test occursin("X-Amz-Signature=", url_get)
+    end
+
+    @testset "s3SignUrl with special characters in key" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        test_key = "folder/sub folder/file with spaces.json"
+        url = s3SignUrl(storage, test_key, 3600)
+        @test occursin("testbucket/", url)
+    end
+
+    @testset "s3SignUrl with deeply nested key" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        test_key = "a/b/c/d/e/deep-file.json"
+        url = s3SignUrl(storage, test_key, 3600)
+        @test occursin("/testbucket/a/b/c/d/e/deep-file.json", url)
+    end
+
+    @testset "integration: pre-signed URL can download existing file" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+
+        test_key = "testrunner-presign-$(GeneralUtils.uuid4snakecase()).json"
+        test_data = "{\"presign\": true, \"test\": \"$(GeneralUtils.uuid4snakecase())\"}"
+        s3PutFile(storage, test_key, test_data)
+
+        url = s3SignUrl(storage, test_key, 300)
+        @test occursin("https://s3-api.yiem.cc/testbucket/", url)
+
+        s3DeleteFile(storage, test_key)
+    end
+
+    # --- s3SignUrl end-to-end: PUT upload, GET download, DELETE ---
+
+    @testset "integration: s3SignUrl PUT upload via pre-signed URL" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+
+        test_key = "testrunner-signurl-put-$(GeneralUtils.uuid4snakecase()).json"
+        test_data = "{\"signed\": true, \"upload\": \"put\"}"
+        content_type = "application/json"
+
+        # Generate pre-signed URL for PUT
+        put_url = s3SignUrl(storage, test_key, 300; verb="PUT", content_type=content_type)
+        @test occursin("X-Amz-Signature=", put_url)
+        @test occursin("X-Amz-Algorithm=AWS4-HMAC-SHA256", put_url)
+        @test occursin("X-Amz-SignedHeaders=", put_url)
+
+        # Upload via HTTP request using the signed URL
+        response = HTTP.request(
+            "PUT",
+            put_url,
+            ["Content-Type" => content_type],
+            test_data
+        )
+        @test response.status == 200
+
+        # Verify upload via s3GetFile
+        downloaded = s3GetFile(storage, test_key)
+        @test downloaded !== nothing
+        @test String(downloaded) == test_data
+
+        # Cleanup
+        s3DeleteFile(storage, test_key)
+    end
+
+    @testset "integration: s3SignUrl GET download via pre-signed URL" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+
+        test_key = "testrunner-signurl-get-$(GeneralUtils.uuid4snakecase()).json"
+        test_data = "{\"signed\": true, \"download\": \"get\"}"
+
+        # Upload via s3PutFile first
+        s3PutFile(storage, test_key, test_data)
+
+        # Generate pre-signed URL for GET
+        get_url = s3SignUrl(storage, test_key, 300; verb="GET")
+        @test occursin("X-Amz-Signature=", get_url)
+        @test occursin("X-Amz-Algorithm=AWS4-HMAC-SHA256", get_url)
+
+        # Download via HTTP GET request using the signed URL
+        response = HTTP.request("GET", get_url)
+        @test response.status == 200
+        @test String(response.body) == test_data
+
+        # Cleanup
+        s3DeleteFile(storage, test_key)
+    end
+
+    @testset "integration: s3SignUrl DELETE via pre-signed URL" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+
+        test_key = "testrunner-signurl-delete-$(GeneralUtils.uuid4snakecase()).json"
+        test_data = "{\"signed\": true, \"delete\": true}"
+
+        # Upload first
+        s3PutFile(storage, test_key, test_data)
+
+        # Verify it exists
+        @test s3GetFile(storage, test_key) !== nothing
+
+        # Generate pre-signed URL for DELETE
+        delete_url = s3SignUrl(storage, test_key, 300; verb="DELETE")
+        @test occursin("X-Amz-Signature=", delete_url)
+        @test occursin("X-Amz-Algorithm=AWS4-HMAC-SHA256", delete_url)
+
+        # Delete via HTTP DELETE request using the signed URL
+        response = HTTP.request("DELETE", delete_url)
+        @test response.status == 204
+
+        # Verify deletion
+        @test s3GetFile(storage, test_key) === nothing
+    end
+
+    @testset "integration: s3SignUrlWeb generates web endpoint URL" begin
+        storage = GarageStorage(
+            "https://s3-api.yiem.cc",
+            "GKb080154a2e5b19100b1b2c6e",
+            "a2c6b1379c2f731d3e6e5a408dd4d6cffca7511717675f55114ff94828febca1",
+            "testbucket"
+        )
+        url = s3SignUrlWeb(storage, "web-test.json", 3600)
+        @test url isa String
+        @test occursin("https://s3-web.yiem.cc", url)
+        @test occursin("/testbucket/web-test.json?", url)
+        @test occursin("X-Amz-Signature=", url)
     end
 
 end