Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Generate types for Space profile results

Manav Rathida198ab88016
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rs
index 2c86d6a894..d16053be5c 100644
--- a/rust/bindings/wasm/space/src/space.rs
+++ b/rust/bindings/wasm/space/src/space.rs
@@ -2,10 +2,9 @@ use std::collections::BTreeMap;
use ente_core::b64;
use ente_space::{
- AccountSpaceCtx, CreatedSpace, DecryptedMessage, DecryptedPost, DecryptedSpaceProfile,
- MessageConversationActivity, MessagePayload, MessageResponse, OpenAccountSpaceCtxInput,
- OpenSpaceLinkCtxInput, PostPhotoAssetOptions, PostResponse, ProfileAvatarResponse,
- ProfileCoverResponse, SpaceActorResponse, SpaceLinkCtx,
+ AccountSpaceCtx, CreatedSpace, DecryptedMessage, DecryptedPost, MessageConversationActivity,
+ MessagePayload, MessageResponse, OpenAccountSpaceCtxInput, OpenSpaceLinkCtxInput,
+ PostPhotoAssetOptions, PostResponse, SpaceActorResponse, SpaceLinkCtx,
};
use serde::{Deserialize, Serialize};
use serde_wasm_bindgen as swb;
@@ -148,9 +147,9 @@ pub struct CreatedSpaceLinkJs {
access_key: String,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct SpaceProfileJs {
+pub struct DecryptedSpaceProfile {
space_id: String,
space_slug: String,
version: i32,
@@ -159,10 +158,31 @@ struct SpaceProfileJs {
posts: Option<i64>,
profile: String,
avatar: Option<ProfileAvatarResponse>,
- cover: Option<ProfileCoverResponse>,
+ cover: Option<ProfileAvatarResponse>,
updated_at: Option<String>,
}
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+struct ProfileAvatarResponse {
+ #[serde(rename = "objectID")]
+ object_id: String,
+ key_version: i32,
+ size: i64,
+ updated_at: String,
+}
+
+impl From<ente_space::ProfileAvatarResponse> for ProfileAvatarResponse {
+ fn from(value: ente_space::ProfileAvatarResponse) -> Self {
+ Self {
+ object_id: value.object_id,
+ key_version: value.key_version,
+ size: value.size,
+ updated_at: value.updated_at,
+ }
+ }
+}
+
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct ActorJs {
@@ -340,7 +360,7 @@ fn created_space_to_js(value: CreatedSpace) -> CreatedSpaceJs {
}
}
-fn profile_to_js(value: DecryptedSpaceProfile) -> Result<SpaceProfileJs, Error> {
+fn profile_to_js(value: ente_space::DecryptedSpaceProfile) -> Result<DecryptedSpaceProfile, Error> {
let profile = String::from_utf8(value.profile).unwrap_or_else(|error| {
log::warn!(
"Space profile {} has invalid UTF-8: {error}",
@@ -348,15 +368,15 @@ fn profile_to_js(value: DecryptedSpaceProfile) -> Result<SpaceProfileJs, Error>
);
String::new()
});
- Ok(SpaceProfileJs {
+ Ok(DecryptedSpaceProfile {
space_id: value.space_id,
space_slug: value.space_slug,
version: value.version,
friends: value.friends,
posts: None,
profile,
- avatar: value.avatar,
- cover: value.cover,
+ avatar: value.avatar.map(Into::into),
+ cover: value.cover.map(Into::into),
updated_at: value.updated_at,
})
}
@@ -368,7 +388,7 @@ fn actor_to_js(actor: SpaceActorResponse, profile: Option<Vec<u8>>) -> Result<Ac
public_key: actor.public_key,
key_version: actor.key_version,
profile: optional_utf8_field(profile, "actor profile")?,
- avatar: actor.avatar,
+ avatar: actor.avatar.map(Into::into),
})
}
@@ -737,10 +757,10 @@ pub struct SpaceLinkCtxHandle {
#[wasm_bindgen]
impl SpaceLinkCtxHandle {
#[wasm_bindgen(js_name = getProfile)]
- pub fn get_profile(&self) -> Result<JsValue, Error> {
+ pub fn get_profile(&self) -> Result<<DecryptedSpaceProfile as Tsify>::JsType, Error> {
let mut profile = profile_to_js(self.inner.profile().clone())?;
profile.posts = Some(self.inner.posts());
- swb::to_value(&profile).map_err(Into::into)
+ profile.into_js().map_err(Into::into)
}
#[wasm_bindgen(js_name = listPosts)]
@@ -899,12 +919,13 @@ impl SpaceAccountCtxHandle {
&self,
space_id: String,
viewer_space_id: Option<String>,
- ) -> Result<JsValue, Error> {
- swb::to_value(&profile_to_js(
+ ) -> Result<<DecryptedSpaceProfile as Tsify>::JsType, Error> {
+ profile_to_js(
self.inner
.get_space_profile_for_display(&space_id, viewer_space_id.as_deref(), None)
.await?,
- )?)
+ )?
+ .into_js()
.map_err(Into::into)
}
@@ -1797,7 +1818,7 @@ mod tests {
#[test]
fn invalid_profile_utf8_uses_empty_payload() {
- let profile = profile_to_js(DecryptedSpaceProfile {
+ let profile = profile_to_js(ente_space::DecryptedSpaceProfile {
space_id: "space-1".into(),
space_slug: "alice".into(),
version: 1,
diff --git a/web/apps/space/src/services/profile.ts b/web/apps/space/src/services/profile.ts
index 42149e7a09..b20f8f684b 100644
--- a/web/apps/space/src/services/profile.ts
+++ b/web/apps/space/src/services/profile.ts
@@ -4,6 +4,7 @@ import { isNamedError } from "ente-base/error";
import { apiOrigin, apiURL } from "ente-base/origins";
import {
openSpaceAccountContext,
+ type DecryptedSpaceProfile,
type SpaceAccountCtxHandle,
} from "ente-space-wasm";
import type {
@@ -49,15 +50,6 @@ interface SpaceLookup {
spaceSlug: string;
}
-interface DecryptedSpaceProfile {
- spaceId: string;
- spaceSlug: string;
- profile: string;
- avatar?: SpaceAvatar;
- cover?: SpaceCover;
- updatedAt?: string;
-}
-
interface UpdateSpaceProfileResponse {
avatar?: SpaceAvatar;
cover?: SpaceCover;
@@ -370,10 +362,10 @@ export const loadExistingSpaceProfile = async (options?: {
// Give the home screen, which shares this lookup, the first request slot.
await new Promise<void>((resolve) => setTimeout(resolve, 0));
const ctx = await ensureCurrentSpaceContext();
- const spaceProfile = (await ctx.getSpaceProfile(
+ const spaceProfile = await ctx.getSpaceProfile(
space.spaceId,
space.spaceId,
- )) as DecryptedSpaceProfile;
+ );
await persistCurrentOwnedSpaces(ctx);
const profile = profileFromDecryptedSpaceProfile(spaceProfile);
persistSpaceProfileAvatar(profile);
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index a524aa83f0..ab40b598eb 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -5,6 +5,7 @@ import log from "ente-base/log";
import { apiOrigin } from "ente-base/origins";
import {
openSpaceLinkContext,
+ type DecryptedSpaceProfile,
type SpaceAccountCtxHandle,
type SpaceLinkCtxHandle,
} from "ente-space-wasm";
@@ -47,18 +48,6 @@ interface SpaceAvatar {
type SpaceCover = SpaceAvatar;
-interface SpaceProfileResponse {
- avatar?: SpaceAvatar;
- cover?: SpaceCover;
- friends?: number;
- posts?: number;
- profile: string;
- updatedAt?: string;
- version?: number;
- spaceId: string;
- spaceSlug: string;
-}
-
interface SpaceActor {
avatar?: SpaceAvatar;
profile?: string;
@@ -444,7 +433,7 @@ const actorProfile = (actor: SpaceActor): FriendProfile => {
};
const profileFromSpaceProfile = (
- spaceProfile: SpaceProfileResponse,
+ spaceProfile: DecryptedSpaceProfile,
): FriendProfile => {
const payload = parseSpaceProfilePayload(spaceProfile.profile);
const fullName =
@@ -720,7 +709,7 @@ export const openPublicSpaceLink = async (
spaceUsername,
});
try {
- const response = ctx.getProfile() as SpaceProfileResponse;
+ const response = ctx.getProfile();
const profile = profileFromSpaceProfile(response);
return {
close: () => ctx.free(),
@@ -1062,10 +1051,7 @@ export const loadCurrentSpaceFriends = async (spaceId: string) => {
export const loadCurrentSpaceFriendsCount = async (spaceId: string) => {
const ctx = await ensureCurrentSpaceContext();
try {
- const spaceProfile = (await ctx.getSpaceProfile(
- spaceId,
- spaceId,
- )) as SpaceProfileResponse;
+ const spaceProfile = await ctx.getSpaceProfile(spaceId, spaceId);
return spaceProfile.friends ?? 0;
} finally {
releaseCurrentSpaceContext(ctx);
@@ -1105,10 +1091,10 @@ export const loadCurrentSpaceProfile = async (
): Promise<FriendProfile> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const spaceProfile = (await ctx.getSpaceProfile(
+ const spaceProfile = await ctx.getSpaceProfile(
spaceId,
viewerSpaceId ?? null,
- )) as SpaceProfileResponse;
+ );
const profile = profileFromSpaceProfile(spaceProfile);
const [avatarUrl, coverUrl] = await Promise.all([
accountAvatarURL(
diff --git a/web/packages/wasm/space/index.ts b/web/packages/wasm/space/index.ts
index 9cffecae2f..500ed0320f 100644
--- a/web/packages/wasm/space/index.ts
+++ b/web/packages/wasm/space/index.ts
@@ -5,6 +5,8 @@ import type {
const wasm = () => import("./pkg/ente_space_wasm");
+export type { DecryptedSpaceProfile } from "./pkg/ente_space_wasm";
+
export type SpaceAccountCtxHandle =
import("./pkg/ente_space_wasm").SpaceAccountCtxHandle;
export type SpaceLinkCtxHandle =