Presigned URLs for asset uploads with SHA-256 dedup

Assets are no longer included in the zip — collected separately and
uploaded directly to S3 via presigned URLs from the API. Each asset
gets a SHA-256 hash (hex in manifest, base64 for S3). Before uploading,
HEAD checks compare x-amz-checksum-sha256 to skip unchanged files.

Author: max-lt

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "openworkers-cli"
-version = "0.2.15"
+version = "0.3.0"
 edition = "2024"
 license = "MIT"
 description = "CLI for OpenWorkers - Self-hosted Cloudflare Workers runtime"
@@ -51,6 +51,7 @@ uuid = { version = "1", features = ["serde"] }
 reqwest = { version = "0.13", default-features = false, features = ["json", "rustls", "multipart"] }
 sha2 = "0.10"
 hex = "0.4"
+base64 = "0.22"
 zip = { version = "7", default-features = false, features = ["deflate"] }
 hmac = "0.12"
 mime_guess = "2"

Cargo.toml

@@ -1,7 +1,8 @@
 use super::{
-    Backend, BackendError, CreateDatabaseInput, CreateEnvironmentInput, CreateKvInput,
-    CreateStorageInput, CreateWorkerInput, Database, DeployInput, Deployment, Environment,
-    KvNamespace, StorageConfig, UpdateEnvironmentInput, UpdateWorkerInput, UploadResult, Worker,
+    AssetManifestEntry, Backend, BackendError, CreateDatabaseInput, CreateEnvironmentInput,
+    CreateKvInput, CreateStorageInput, CreateWorkerInput, Database, DeployInput, Deployment,
+    Environment, KvNamespace, StorageConfig, UpdateEnvironmentInput, UpdateWorkerInput,
+    UploadResult, Worker,
 };
 use crate::config::DEFAULT_API_URL;
 use reqwest::Client;
@@ -209,6 +210,7 @@ impl Backend for ApiBackend {
         &self,
         name: &str,
         zip_data: Vec<u8>,
+        assets_manifest: &[AssetManifestEntry],
     ) -> Result<UploadResult, BackendError> {
         use reqwest::multipart::{Form, Part};
 
@@ -220,7 +222,13 @@ impl Backend for ApiBackend {
             .mime_str("application/zip")
             .map_err(|e| BackendError::Api(e.to_string()))?;
 
-        let form = Form::new().part("file", part);
+        let mut form = Form::new().part("file", part);
+
+        if !assets_manifest.is_empty() {
+            let manifest_json = serde_json::to_string(assets_manifest)
+                .map_err(|e| BackendError::Api(e.to_string()))?;
+            form = form.text("assets", manifest_json);
+        }
 
         let response = self
             .request(

src/backend/api.rs

@@ -1,8 +1,8 @@
 use super::{
-    Backend, BackendError, CreateDatabaseInput, CreateEnvironmentInput, CreateKvInput,
-    CreateStorageInput, CreateWorkerInput, Database, DeployInput, Deployment, Environment,
-    EnvironmentValue, KvNamespace, StorageConfig, UpdateEnvironmentInput, UpdateWorkerInput,
-    UploadResult, UploadWorkerInfo, UploadedCounts, Worker,
+    AssetManifestEntry, Backend, BackendError, CreateDatabaseInput, CreateEnvironmentInput,
+    CreateKvInput, CreateStorageInput, CreateWorkerInput, Database, DeployInput, DeployedInfo,
+    Deployment, Environment, EnvironmentValue, KvNamespace, StorageConfig, UpdateEnvironmentInput,
+    UpdateWorkerInput, UploadResult, UploadWorkerInfo, Worker,
 };
 use crate::config::PlatformStorageConfig;
 use crate::s3::{S3Client, S3Config, get_mime_type};
@@ -345,6 +345,7 @@ impl Backend for DbBackend {
         &self,
         name: &str,
         zip_data: Vec<u8>,
+        _assets_manifest: &[AssetManifestEntry],
     ) -> Result<UploadResult, BackendError> {
         // 1. Get worker by name
         let worker = self.get_worker(name).await?;
@@ -540,6 +541,7 @@ impl Backend for DbBackend {
         .fetch_one(&self.pool)
         .await?;
 
+        let next_version: i32 = row.get("out_next_version");
         let functions_created: i32 = row.get("functions_created");
 
         if functions_created > 0 {
@@ -556,13 +558,11 @@ impl Backend for DbBackend {
             prefix,
         });
 
-        let mut uploaded_count = 0;
-
         for (path, content) in assets {
             let content_type = get_mime_type(&path);
 
             match s3_client.put(&path, content, content_type).await {
-                Ok(true) => uploaded_count += 1,
+                Ok(true) => {}
                 Ok(false) => eprintln!("Failed to upload {}", path),
                 Err(e) => eprintln!("Error uploading {}: {}", path, e),
             }
@@ -595,10 +595,11 @@ impl Backend for DbBackend {
                 name: worker.name,
                 url,
             },
-            uploaded: UploadedCounts {
-                script: true,
-                assets: uploaded_count,
-            },
+            deployed: Some(DeployedInfo {
+                version: next_version,
+                functions: functions_created,
+            }),
+            assets: None,
         })
     }
 

src/backend/db.rs

@@ -1,8 +1,8 @@
 use super::{
-    Backend, BackendError, CreateDatabaseInput, CreateEnvironmentInput, CreateKvInput,
-    CreateStorageInput, CreateWorkerInput, Database, DeployInput, Deployment, Environment,
-    KvNamespace, StorageConfig, UpdateEnvironmentInput, UpdateWorkerInput, UploadResult,
-    UploadWorkerInfo, UploadedCounts, Worker,
+    AssetManifestEntry, Backend, BackendError, CreateDatabaseInput, CreateEnvironmentInput,
+    CreateKvInput, CreateStorageInput, CreateWorkerInput, Database, DeployInput, Deployment,
+    Environment, KvNamespace, StorageConfig, UpdateEnvironmentInput, UpdateWorkerInput,
+    UploadResult, UploadWorkerInfo, Worker,
 };
 use chrono::Utc;
 use sha2::{Digest, Sha256};
@@ -184,6 +184,7 @@ impl Backend for MockBackend {
         &self,
         name: &str,
         _zip_data: Vec<u8>,
+        _assets_manifest: &[AssetManifestEntry],
     ) -> Result<UploadResult, BackendError> {
         let state = self.state.lock().unwrap();
 
@@ -199,10 +200,8 @@ impl Backend for MockBackend {
                 name: worker.name.clone(),
                 url: format!("https://{}.workers.rocks", worker.name),
             },
-            uploaded: UploadedCounts {
-                script: true,
-                assets: 0,
-            },
+            deployed: None,
+            assets: None,
         })
     }
 

src/backend/mock.rs

@@ -89,7 +89,8 @@ pub struct DeployInput {
 pub struct UploadResult {
     pub success: bool,
     pub worker: UploadWorkerInfo,
-    pub uploaded: UploadedCounts,
+    pub deployed: Option<DeployedInfo>,
+    pub assets: Option<Vec<PresignedAsset>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -102,9 +103,26 @@ pub struct UploadWorkerInfo {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UploadedCounts {
-    pub script: bool,
-    pub assets: i32,
+pub struct DeployedInfo {
+    pub version: i32,
+    pub functions: i32,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PresignedAsset {
+    pub path: String,
+    pub head_url: String,
+    pub put_url: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AssetManifestEntry {
+    pub path: String,
+    pub size: usize,
+    pub content_type: String,
+    pub hash: String,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -291,6 +309,7 @@ pub trait Backend: Send + Sync {
         &self,
         name: &str,
         zip_data: Vec<u8>,
+        assets_manifest: &[AssetManifestEntry],
     ) -> impl std::future::Future<Output = Result<UploadResult, BackendError>> + Send;
 
     // Environment methods