Merge branch 'main' into 4.3.0-alpha.1-leftover-fixes

Cargo.toml

@@ -20,12 +20,14 @@ wasmer-compiler-cranelift = { version = "=4.3.0-alpha.1", path = "lib/compiler-c
 wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "lib/compiler-singlepass", optional = true }
 wasmer-compiler-llvm = { version = "=4.3.0-alpha.1", path = "lib/compiler-llvm", optional = true }
 wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "lib/emscripten", optional = true }
-wasmer-wasix = { version = "0.18.4", path = "lib/wasix", optional = true }
+wasmer-wasix = { path = "lib/wasix", optional = true }
 wasmer-wast = { version = "=4.3.0-alpha.1", path = "tests/lib/wast", optional = true }
 wasi-test-generator = { version = "=4.3.0-alpha.1", path = "tests/wasi-wast", optional = true }
 wasmer-cache = { version = "=4.3.0-alpha.1", path = "lib/cache", optional = true }
 wasmer-types = { version = "=4.3.0-alpha.1", path = "lib/types" }
 wasmer-middlewares = { version = "=4.3.0-alpha.1", path = "lib/middlewares", optional = true }
+
+# Third party dependencies
 cfg-if = "1.0"
 tokio = { version = "1", features = [
     "rt",
@@ -87,9 +89,10 @@ version = "4.3.0-alpha.1"
 [workspace.dependencies]
 # Repo-local crates
 wasmer-config = { path = "./lib/config" }
+wasmer-wasix = { path = "./lib/wasix" }
 
 # Wasmer-owned crates
-webc = { version = "6.0.0-alpha3", default-features = false, features = ["package"] }
+webc = { version = "6.0.0-alpha8", default-features = false, features = ["package"] }
 edge-schema = { version = "=0.1.0" }
 shared-buffer = "0.1.4"
 

lib/backend-api/Cargo.toml

@@ -17,7 +17,7 @@ rust-version.workspace = true
 [dependencies]
 # Wasmer dependencies.
 edge-schema.workspace = true
-wasmer-config = { version = "0.1.1", path = "../config" }
+wasmer-config = { version = "0.2.0", path = "../config" }
 webc.workspace = true
 
 # crates.io dependencies.

lib/backend-api/schema.graphql

@@ -361,7 +361,7 @@ type Package implements Likeable & Node & PackageOwner {
   """List of app templates for this package"""
   appTemplates(offset: Int, before: String, after: String, first: Int, last: Int): AppTemplateConnection!
   packagewebcSet(offset: Int, before: String, after: String, first: Int, last: Int): PackageWebcConnection!
-  versions: [PackageVersion]!
+  versions: [PackageVersion]
   collectionSet: [Collection!]!
   categories(offset: Int, before: String, after: String, first: Int, last: Int): CategoryConnection!
   keywords(offset: Int, before: String, after: String, first: Int, last: Int): PackageKeywordConnection!
@@ -504,7 +504,7 @@ scalar JSONString
 type WebcImage implements Node {
   """The ID of the object"""
   id: ID!
-  version: RegistryWebcImageVersionChoices!
+  version: WebcVersion
 
   """"""
   fileSize: BigInt!
@@ -518,11 +518,8 @@ type WebcImage implements Node {
   webcUrl: String!
 }
 
-enum RegistryWebcImageVersionChoices {
-  """v2"""
+enum WebcVersion {
   V2
-
-  """v3"""
   V3
 }
 
@@ -645,7 +642,9 @@ type DeployAppVersion implements Node {
     last: Int
   ): LogConnection!
   usageMetrics(forRange: MetricRange!, variant: MetricType!): [UsageMetric]!
-  sourcePackageVersion: PackageVersion!
+  sourcePackageVersion: PackageVersion
+  sourcePackageRelease: PackageWebc
+  sourcePackage: Package!
   aggregateMetrics: AggregateMetrics!
   volumes: [AppVersionVolume]
   favicon: URL
@@ -806,6 +805,24 @@ enum LogStream {
   RUNTIME
 }
 
+type PackageWebc implements Node & PackageReleaseInterface & PackageInstance {
+  """The ID of the object"""
+  id: ID!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  package: Package!
+  webc: WebcImage
+  piritaManifest: JSONString
+  piritaOffsets: JSONString
+  piritaVolumes: JSONString
+  isArchived: Boolean!
+  clientName: String
+  publishedBy: User!
+  webcV3: WebcImage
+  tag: String!
+  webcUrl: String!
+}
+
 type AppVersionVolume {
   name: String!
   mountPaths: [AppVersionVolumeMountPath]!
@@ -1052,11 +1069,6 @@ type PackageDistribution {
   webcVersion: WebcVersion
 }
 
-enum WebcVersion {
-  V2
-  V3
-}
-
 type PackageVersionFilesystem {
   wasm: String!
   host: String!
@@ -1235,24 +1247,6 @@ type PackageWebcEdge {
   cursor: String!
 }
 
-type PackageWebc implements Node & PackageReleaseInterface & PackageInstance {
-  """The ID of the object"""
-  id: ID!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  package: Package!
-  webc: WebcImage
-  piritaManifest: JSONString
-  piritaOffsets: JSONString
-  piritaVolumes: JSONString
-  isArchived: Boolean!
-  clientName: String
-  publishedBy: User!
-  webcV3: WebcImage
-  tag: String!
-  webcUrl: String!
-}
-
 type Collection {
   slug: String!
   displayName: String!
@@ -2834,6 +2828,8 @@ type Mutation {
   mfa2EmailGetToken(input: MFAGenerateEmailOTPInput!): MFAEmailGenerationResponse
   publishPublicKey(input: PublishPublicKeyInput!): PublishPublicKeyPayload
   publishPackage(input: PublishPackageInput!): PublishPackagePayload
+  pushPackageRelease(input: PushPackageReleaseInput!): PushPackageReleasePayload
+  tagPackageRelease(input: TagPackageReleaseInput!): TagPackageReleasePayload
   updatePackage(input: UpdatePackageInput!): UpdatePackagePayload
   likePackage(input: LikePackageInput!): LikePackagePayload
   unlikePackage(input: UnlikePackageInput!): UnlikePackagePayload
@@ -3586,6 +3582,48 @@ enum UploadFormat {
   webcv3
 }
 
+type PushPackageReleasePayload {
+  success: Boolean!
+  packageWebc: PackageWebc
+  clientMutationId: String
+}
+
+input PushPackageReleaseInput {
+  namespace: String!
+  signedUrl: String!
+  name: String
+
+  """Whether the package is private"""
+  private: Boolean = false
+  clientMutationId: String
+}
+
+type TagPackageReleasePayload {
+  success: Boolean!
+  packageVersion: PackageVersion
+  clientMutationId: String
+}
+
+input TagPackageReleaseInput {
+  packageReleaseId: ID!
+  name: String!
+  version: String!
+  manifest: String!
+  namespace: String
+  description: String
+  license: String
+  licenseFile: String
+  readme: String
+  repository: String
+  homepage: String
+  signature: InputSignature
+
+  """The package icon"""
+  icon: String
+  private: Boolean = false
+  clientMutationId: String
+}
+
 type UpdatePackagePayload {
   package: Package!
   clientMutationId: String

lib/backend-api/src/query.rs

@@ -13,8 +13,9 @@ use crate::{
     types::{
         self, CreateNamespaceVars, DeployApp, DeployAppConnection, DeployAppVersion,
         DeployAppVersionConnection, DnsDomain, GetCurrentUserWithAppsVars, GetDeployAppAndVersion,
-        GetDeployAppVersionsVars, GetNamespaceAppsVars, Log, LogStream, PackageVersionConnection,
-        PublishDeployAppVars, UpsertDomainFromZoneFileVars,
+        GetDeployAppVersionsVars, GetNamespaceAppsVars, GetSignedUrlForPackageUploadVariables, Log,
+        LogStream, PackageVersionConnection, PublishDeployAppVars, PushPackageReleasePayload,
+        SignedUrl, TagPackageReleasePayload, UpsertDomainFromZoneFileVars,
     },
     GraphQLApiFailure, WasmerClient,
 };
@@ -54,6 +55,84 @@ pub async fn fetch_webc_package(
     webc::compat::Container::from_bytes(data).context("failed to parse webc package")
 }
 
+/// Get a signed URL to upload packages.
+pub async fn get_signed_url_for_package_upload(
+    client: &WasmerClient,
+    expires_after_seconds: Option<i32>,
+    filename: Option<&str>,
+    name: Option<&str>,
+    version: Option<&str>,
+) -> Result<Option<SignedUrl>, anyhow::Error> {
+    client
+        .run_graphql(types::GetSignedUrlForPackageUpload::build(
+            GetSignedUrlForPackageUploadVariables {
+                expires_after_seconds,
+                filename,
+                name,
+                version,
+            },
+        ))
+        .await
+        .map(|r| r.get_signed_url_for_package_upload)
+}
+/// Push a package to the registry.
+pub async fn push_package_release(
+    client: &WasmerClient,
+    name: Option<&str>,
+    namespace: &str,
+    signed_url: &str,
+    private: Option<bool>,
+) -> Result<Option<PushPackageReleasePayload>, anyhow::Error> {
+    client
+        .run_graphql_strict(types::PushPackageRelease::build(
+            types::PushPackageReleaseVariables {
+                name,
+                namespace,
+                private,
+                signed_url,
+            },
+        ))
+        .await
+        .map(|r| r.push_package_release)
+}
+
+#[allow(clippy::too_many_arguments)]
+pub async fn tag_package_release(
+    client: &WasmerClient,
+    description: Option<&str>,
+    homepage: Option<&str>,
+    license: Option<&str>,
+    license_file: Option<&str>,
+    manifest: &str,
+    name: &str,
+    namespace: Option<&str>,
+    package_release_id: &cynic::Id,
+    private: Option<bool>,
+    readme: Option<&str>,
+    repository: Option<&str>,
+    version: &str,
+) -> Result<Option<TagPackageReleasePayload>, anyhow::Error> {
+    client
+        .run_graphql_strict(types::TagPackageRelease::build(
+            types::TagPackageReleaseVariables {
+                description,
+                homepage,
+                license,
+                license_file,
+                manifest,
+                name,
+                namespace,
+                package_release_id,
+                private,
+                readme,
+                repository,
+                version,
+            },
+        ))
+        .await
+        .map(|r| r.tag_package_release)
+}
+
 /// Get the currently logged in used, together with all accessible namespaces.
 ///
 /// You can optionally filter the namespaces by the user role.