Skip to content

armgit / ente

Public Imported from GitHub
0

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

Finish typed Space WASM boundaries

Manav Rathi22422ca5f12c
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rs
index d16053be5c..3df0b8518d 100644
--- a/rust/bindings/wasm/space/src/space.rs
+++ b/rust/bindings/wasm/space/src/space.rs
@@ -1,11 +1,7 @@
use std::collections::BTreeMap;
use ente_core::b64;
-use ente_space::{
- AccountSpaceCtx, CreatedSpace, DecryptedMessage, DecryptedPost, MessageConversationActivity,
- MessagePayload, MessageResponse, OpenAccountSpaceCtxInput, OpenSpaceLinkCtxInput,
- PostPhotoAssetOptions, PostResponse, SpaceActorResponse, SpaceLinkCtx,
-};
+use ente_space::{AccountSpaceCtx, DecryptedMessage, DecryptedPost, MessagePayload, SpaceLinkCtx};
use serde::{Deserialize, Serialize};
use serde_wasm_bindgen as swb;
use tsify::Tsify;
@@ -68,7 +64,7 @@ impl From<Error> for JsValue {
#[derive(Deserialize, Tsify)]
#[serde(rename_all = "camelCase")]
-pub struct OpenAccountSpaceCtxJsInput {
+pub struct OpenAccountSpaceCtxInput {
base_url: String,
#[tsify(optional)]
space_session_token: Option<String>,
@@ -84,7 +80,7 @@ pub struct OpenAccountSpaceCtxJsInput {
#[derive(Deserialize, Tsify)]
#[serde(rename_all = "camelCase")]
-pub struct OpenSpaceLinkCtxJsInput {
+pub struct OpenSpaceLinkCtxInput {
base_url: String,
space_username: String,
access_key: String,
@@ -94,7 +90,7 @@ pub struct OpenSpaceLinkCtxJsInput {
client_version: Option<String>,
}
-#[derive(Deserialize, Tsify)]
+#[derive(Serialize, Deserialize, Tsify)]
#[serde(rename_all = "camelCase")]
pub struct SpaceKeyResponse {
space_id: String,
@@ -123,25 +119,43 @@ impl From<SpaceKeyResponse> for ente_space::SpaceKeyResponse {
}
}
-#[derive(Deserialize)]
+impl From<ente_space::SpaceKeyResponse> for SpaceKeyResponse {
+ fn from(value: ente_space::SpaceKeyResponse) -> Self {
+ Self {
+ space_id: value.space_id,
+ space_slug: value.space_slug,
+ root_wrapped_space_key: value.root_wrapped_space_key,
+ public_key: value.public_key,
+ encrypted_secret_key: value.encrypted_secret_key,
+ encrypted_profile: value.encrypted_profile,
+ key_version: value.key_version,
+ }
+ }
+}
+
+#[derive(Deserialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct PostPhotoAssetOptionsJsInput {
+pub struct PostPhotoAssetOptions {
+ #[tsify(optional)]
width: Option<i32>,
+ #[tsify(optional)]
height: Option<i32>,
+ #[tsify(optional)]
media_type: Option<String>,
+ #[tsify(optional)]
thumb_hash: Option<String>,
}
#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-pub struct CreatedSpaceJs {
+pub struct CreatedSpace {
space_id: String,
space_slug: String,
}
#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-pub struct CreatedSpaceLinkJs {
+pub struct CreatedSpaceLink {
space_id: String,
space_slug: String,
access_key: String,
@@ -183,9 +197,27 @@ impl From<ente_space::ProfileAvatarResponse> for ProfileAvatarResponse {
}
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct ActorJs {
+pub struct UpdateSpaceProfileResponse {
+ status: String,
+ avatar: Option<ProfileAvatarResponse>,
+ cover: Option<ProfileAvatarResponse>,
+}
+
+impl From<ente_space::transport::UpdateSpaceProfileResponse> for UpdateSpaceProfileResponse {
+ fn from(value: ente_space::transport::UpdateSpaceProfileResponse) -> Self {
+ Self {
+ status: value.status,
+ avatar: value.avatar.map(Into::into),
+ cover: value.cover.map(Into::into),
+ }
+ }
+}
+
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+struct SpaceActorResponse {
space_id: String,
space_slug: String,
public_key: String,
@@ -194,32 +226,32 @@ struct ActorJs {
avatar: Option<ProfileAvatarResponse>,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct PostJs {
+pub struct PostResponse {
post_id: i64,
space_id: String,
space_slug: String,
- author: ActorJs,
+ author: SpaceActorResponse,
caption: Option<String>,
encrypted_post_key: String,
key_version: i32,
- objects: Vec<PostObjectJs>,
+ objects: Vec<PostObjectPayload>,
created_at: String,
viewer_liked: bool,
is_unavailable: bool,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct PostPageJs {
- items: Vec<PostJs>,
+pub struct PostPage {
+ items: Vec<PostResponse>,
next_cursor: String,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct MessageJs {
+pub struct MessageResponse {
message_id: String,
kind: String,
sender_space_id: String,
@@ -235,16 +267,16 @@ struct MessageJs {
is_unavailable: bool,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct MessagePageJs {
- items: Vec<MessageJs>,
+pub struct MessagePage {
+ items: Vec<MessageResponse>,
next_cursor: String,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct MessageConversationActivityJs {
+struct MessageConversationActivity {
id: String,
#[serde(rename = "type")]
activity_type: String,
@@ -258,9 +290,9 @@ struct MessageConversationActivityJs {
is_unavailable: bool,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct PostObjectJs {
+struct PostObjectPayload {
object_key: String,
#[serde(skip_serializing_if = "Option::is_none")]
size: Option<i64>,
@@ -280,46 +312,132 @@ struct PostObjectJs {
media_type: Option<String>,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct ConversationChatSummaryJs {
- latest_activity: MessageConversationActivityJs,
- unread_activities: Vec<MessageConversationActivityJs>,
+struct ConversationChatSummaryResponse {
+ latest_activity: MessageConversationActivity,
+ unread_activities: Vec<MessageConversationActivity>,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct ConversationsJs {
- friends: Vec<FriendJs>,
- pending_requests: Vec<FriendRequestJs>,
- chat_summaries: BTreeMap<String, ConversationChatSummaryJs>,
+pub struct ConversationsResponse {
+ friends: Vec<SpaceFriendResponse>,
+ pending_requests: Vec<SpaceFriendRequestResponse>,
+ chat_summaries: BTreeMap<String, ConversationChatSummaryResponse>,
latest_post_created_at: Option<String>,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct FriendJs {
- friend: ActorJs,
+pub struct SpaceFriendResponse {
+ friend: SpaceActorResponse,
share_key_version: i32,
created_at: String,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct FriendRequestJs {
+pub struct SpaceFriendRequestResponse {
request_id: i64,
- requester: ActorJs,
+ requester: SpaceActorResponse,
created_at: String,
}
-#[derive(Serialize)]
+#[derive(Serialize, Tsify)]
#[serde(rename_all = "camelCase")]
-struct SentFriendRequestJs {
+pub struct SpaceSentFriendRequestResponse {
request_id: i64,
- target: ActorJs,
+ target: SpaceActorResponse,
created_at: String,
}
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+pub struct SpaceLookupResponse {
+ space_id: String,
+ space_slug: String,
+ owner: String,
+ public_key: String,
+}
+
+impl From<ente_space::SpaceLookupResponse> for SpaceLookupResponse {
+ fn from(value: ente_space::SpaceLookupResponse) -> Self {
+ Self {
+ space_id: value.space_id,
+ space_slug: value.space_slug,
+ owner: value.owner,
+ public_key: value.public_key,
+ }
+ }
+}
+
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+pub struct FriendRelationshipResponse {
+ relationship: String,
+}
+
+impl From<ente_space::FriendRelationshipResponse> for FriendRelationshipResponse {
+ fn from(value: ente_space::FriendRelationshipResponse) -> Self {
+ Self {
+ relationship: value.relationship,
+ }
+ }
+}
+
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+pub struct FriendStatusResponse {
+ status: String,
+}
+
+impl From<ente_space::FriendStatusResponse> for FriendStatusResponse {
+ fn from(value: ente_space::FriendStatusResponse) -> Self {
+ Self {
+ status: value.status,
+ }
+ }
+}
+
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+pub struct SpaceUnreadStatusResponse {
+ notifications_unread: bool,
+}
+
+impl From<ente_space::SpaceUnreadStatusResponse> for SpaceUnreadStatusResponse {
+ fn from(value: ente_space::SpaceUnreadStatusResponse) -> Self {
+ Self {
+ notifications_unread: value.notifications_unread,
+ }
+ }
+}
+
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+pub struct LikePostResponse {
+ liked: bool,
+}
+
+impl From<ente_space::LikePostResponse> for LikePostResponse {
+ fn from(value: ente_space::LikePostResponse) -> Self {
+ Self { liked: value.liked }
+ }
+}
+
+#[derive(Serialize, Tsify)]
+#[serde(rename_all = "camelCase")]
+pub struct LikeMessageResponse {
+ liked: bool,
+}
+
+impl From<ente_space::LikeMessageResponse> for LikeMessageResponse {
+ fn from(value: ente_space::LikeMessageResponse) -> Self {
+ Self { liked: value.liked }
+ }
+}
+
fn decode_b64_field(value: &str) -> Result<Vec<u8>, Error> {
b64::decode(value)
.map_err(ente_space::Error::from)
@@ -353,8 +471,8 @@ fn optional_utf8_field(bytes: Option<Vec<u8>>, field: &str) -> Result<Option<Str
bytes.map(|value| utf8_field(value, field)).transpose()
}
-fn created_space_to_js(value: CreatedSpace) -> CreatedSpaceJs {
- CreatedSpaceJs {
+fn created_space_to_js(value: ente_space::CreatedSpace) -> CreatedSpace {
+ CreatedSpace {
space_id: value.space_id,
space_slug: value.space_slug,
}
@@ -381,8 +499,11 @@ fn profile_to_js(value: ente_space::DecryptedSpaceProfile) -> Result<DecryptedSp
})
}
-fn actor_to_js(actor: SpaceActorResponse, profile: Option<Vec<u8>>) -> Result<ActorJs, Error> {
- Ok(ActorJs {
+fn actor_to_js(
+ actor: ente_space::SpaceActorResponse,
+ profile: Option<Vec<u8>>,
+) -> Result<SpaceActorResponse, Error> {
+ Ok(SpaceActorResponse {
space_id: actor.space_id,
space_slug: actor.space_slug,
public_key: actor.public_key,
@@ -394,8 +515,8 @@ fn actor_to_js(actor: SpaceActorResponse, profile: Option<Vec<u8>>) -> Result<Ac
async fn account_actor_to_js(
ctx: &AccountSpaceCtx,
- actor: SpaceActorResponse,
-) -> Result<ActorJs, Error> {
+ actor: ente_space::SpaceActorResponse,
+) -> Result<SpaceActorResponse, Error> {
let fallback = actor.clone();
let converted = match ctx.decrypt_actor_profile(&actor).await {
Ok(profile) => actor_to_js(actor, profile),
@@ -415,19 +536,19 @@ async fn account_actor_to_js(
}
}
-fn public_actor_to_js(actor: SpaceActorResponse) -> Result<ActorJs, Error> {
+fn public_actor_to_js(actor: ente_space::SpaceActorResponse) -> Result<SpaceActorResponse, Error> {
actor_to_js(actor, None)
}
fn post_object_to_js(
post_key: Option<&[u8]>,
object: ente_space::PostObjectPayload,
-) -> Result<PostObjectJs, Error> {
+) -> Result<PostObjectPayload, Error> {
let metadata = match post_key {
Some(post_key) => ente_space::client::decrypt_post_object_metadata(post_key, &object)?,
None => None,
};
- Ok(PostObjectJs {
+ Ok(PostObjectPayload {
object_key: object.object_key,
size: object.size,
position: object.position,
@@ -443,7 +564,7 @@ fn post_object_to_js(
fn post_objects_to_js(
post_key: Option<&[u8]>,
objects: Vec<ente_space::PostObjectPayload>,
-) -> Result<Vec<PostObjectJs>, Error> {
+) -> Result<Vec<PostObjectPayload>, Error> {
objects
.into_iter()
.map(|object| post_object_to_js(post_key, object))
@@ -452,11 +573,11 @@ fn post_objects_to_js(
async fn account_post_to_js(
ctx: &AccountSpaceCtx,
- post: PostResponse,
+ post: ente_space::PostResponse,
decrypted: DecryptedPost,
-) -> Result<PostJs, Error> {
+) -> Result<PostResponse, Error> {
let author = account_actor_to_js(ctx, post.author).await?;
- Ok(PostJs {
+ Ok(PostResponse {
post_id: post.post_id,
space_id: post.space_id,
space_slug: post.space_slug,
@@ -471,8 +592,8 @@ async fn account_post_to_js(
})
}
-fn unavailable_post_to_js(post: PostResponse) -> Result<PostJs, Error> {
- Ok(PostJs {
+fn unavailable_post_to_js(post: ente_space::PostResponse) -> Result<PostResponse, Error> {
+ Ok(PostResponse {
post_id: post.post_id,
space_id: post.space_id,
space_slug: post.space_slug,
@@ -490,7 +611,7 @@ fn unavailable_post_to_js(post: PostResponse) -> Result<PostJs, Error> {
async fn account_post_page_to_js(
ctx: &AccountSpaceCtx,
page: ente_space::PostPage,
-) -> Result<PostPageJs, Error> {
+) -> Result<PostPage, Error> {
let mut items = Vec::with_capacity(page.items.len());
for post in page.items {
let fallback = post.clone();
@@ -511,14 +632,17 @@ async fn account_post_page_to_js(
Err(error) => return Err(error),
}
}
- Ok(PostPageJs {
+ Ok(PostPage {
items,
next_cursor: page.next_cursor,
})
}
-fn link_post_to_js(post: PostResponse, decrypted: DecryptedPost) -> Result<PostJs, Error> {
- Ok(PostJs {
+fn link_post_to_js(
+ post: ente_space::PostResponse,
+ decrypted: DecryptedPost,
+) -> Result<PostResponse, Error> {
+ Ok(PostResponse {
post_id: post.post_id,
space_id: post.space_id,
space_slug: post.space_slug,
@@ -534,15 +658,15 @@ fn link_post_to_js(post: PostResponse, decrypted: DecryptedPost) -> Result<PostJ
}
fn account_message_to_js(
- mut message: MessageResponse,
+ mut message: ente_space::MessageResponse,
decrypted: DecryptedMessage,
-) -> Result<MessageJs, Error> {
+) -> Result<MessageResponse, Error> {
message.kind = decrypted.payload.kind;
Ok(message_to_js(message, decrypted.payload.text))
}
-fn message_to_js(message: MessageResponse, text: String) -> MessageJs {
- MessageJs {
+fn message_to_js(message: ente_space::MessageResponse, text: String) -> MessageResponse {
+ MessageResponse {
message_id: message.message_id,
kind: message.kind,
sender_space_id: message.sender_space_id,
@@ -559,8 +683,8 @@ fn message_to_js(message: MessageResponse, text: String) -> MessageJs {
}
}
-fn unavailable_message_to_js(message: MessageResponse) -> MessageJs {
- MessageJs {
+fn unavailable_message_to_js(message: ente_space::MessageResponse) -> MessageResponse {
+ MessageResponse {
message_id: message.message_id,
kind: message.kind,
sender_space_id: message.sender_space_id,
@@ -580,8 +704,8 @@ fn unavailable_message_to_js(message: MessageResponse) -> MessageJs {
async fn account_message_response_to_js(
ctx: &AccountSpaceCtx,
viewer_space_id: &str,
- message: MessageResponse,
-) -> Result<MessageJs, Error> {
+ message: ente_space::MessageResponse,
+) -> Result<MessageResponse, Error> {
if message.is_deleted {
return Ok(message_to_js(message, String::new()));
}
@@ -597,8 +721,8 @@ async fn account_message_response_to_js(
async fn resilient_account_message_response_to_js(
ctx: &AccountSpaceCtx,
viewer_space_id: &str,
- message: MessageResponse,
-) -> Result<MessageJs, Error> {
+ message: ente_space::MessageResponse,
+) -> Result<MessageResponse, Error> {
let fallback = message.clone();
match account_message_response_to_js(ctx, viewer_space_id, message).await {
Ok(message) => Ok(message),
@@ -617,7 +741,7 @@ async fn resilient_account_message_response_to_js(
async fn message_conversation_activity_payload(
ctx: &AccountSpaceCtx,
viewer_space_id: &str,
- activity: &MessageConversationActivity,
+ activity: &ente_space::MessageConversationActivity,
) -> Result<Option<MessagePayload>, Error> {
if activity.message_cipher.trim().is_empty()
|| activity.encrypted_message_key.trim().is_empty()
@@ -626,7 +750,7 @@ async fn message_conversation_activity_payload(
return Ok(None);
}
- let message = MessageResponse {
+ let message = ente_space::MessageResponse {
message_id: activity.message_id.clone().unwrap_or_default(),
kind: if activity.kind.trim().is_empty() {
"regular".to_owned()
@@ -653,15 +777,15 @@ async fn message_conversation_activity_payload(
async fn message_conversation_activity_to_js(
ctx: &AccountSpaceCtx,
viewer_space_id: &str,
- activity: MessageConversationActivity,
-) -> Result<MessageConversationActivityJs, Error> {
+ activity: ente_space::MessageConversationActivity,
+) -> Result<MessageConversationActivity, Error> {
let payload = message_conversation_activity_payload(ctx, viewer_space_id, &activity).await?;
let kind = payload
.as_ref()
.map(|payload| payload.kind.clone())
.unwrap_or_else(|| activity.kind.clone());
let text = payload.map(|payload| payload.text);
- Ok(MessageConversationActivityJs {
+ Ok(MessageConversationActivity {
id: activity.id,
activity_type: activity.activity_type,
kind,
@@ -676,9 +800,9 @@ async fn message_conversation_activity_to_js(
}
fn unavailable_message_conversation_activity_to_js(
- activity: MessageConversationActivity,
-) -> MessageConversationActivityJs {
- MessageConversationActivityJs {
+ activity: ente_space::MessageConversationActivity,
+) -> MessageConversationActivity {
+ MessageConversationActivity {
id: activity.id,
activity_type: activity.activity_type,
kind: activity.kind,
@@ -695,8 +819,8 @@ fn unavailable_message_conversation_activity_to_js(
async fn resilient_message_conversation_activity_to_js(
ctx: &AccountSpaceCtx,
viewer_space_id: &str,
- activity: MessageConversationActivity,
-) -> Result<MessageConversationActivityJs, Error> {
+ activity: ente_space::MessageConversationActivity,
+) -> Result<MessageConversationActivity, Error> {
let fallback = activity.clone();
match message_conversation_activity_to_js(ctx, viewer_space_id, activity).await {
Ok(activity) => Ok(activity),
@@ -714,11 +838,11 @@ async fn resilient_message_conversation_activity_to_js(
#[wasm_bindgen(js_name = spaceOpenAccountCtx)]
pub fn space_open_account_ctx(
- input: <OpenAccountSpaceCtxJsInput as Tsify>::JsType,
+ input: <OpenAccountSpaceCtxInput as Tsify>::JsType,
) -> Result<SpaceAccountCtxHandle, Error> {
- let input = OpenAccountSpaceCtxJsInput::from_js(input)?;
+ let input = OpenAccountSpaceCtxInput::from_js(input)?;
let space_root_key = decode_b64_field(&input.space_root_key_b64)?;
- let ctx = AccountSpaceCtx::open(OpenAccountSpaceCtxInput {
+ let ctx = AccountSpaceCtx::open(ente_space::OpenAccountSpaceCtxInput {
base_url: input.base_url,
space_session_token: input.space_session_token,
space_root_key,
@@ -734,10 +858,10 @@ pub fn space_open_account_ctx(
#[wasm_bindgen(js_name = spaceOpenLinkCtx)]
pub async fn space_open_link_ctx(
- input: <OpenSpaceLinkCtxJsInput as Tsify>::JsType,
+ input: <OpenSpaceLinkCtxInput as Tsify>::JsType,
) -> Result<SpaceLinkCtxHandle, Error> {
- let input = OpenSpaceLinkCtxJsInput::from_js(input)?;
- let inner = SpaceLinkCtx::open(OpenSpaceLinkCtxInput {
+ let input = OpenSpaceLinkCtxInput::from_js(input)?;
+ let inner = SpaceLinkCtx::open(ente_space::OpenSpaceLinkCtxInput {
base_url: input.base_url,
space_slug: input.space_username,
access_key: input.access_key,
@@ -764,7 +888,7 @@ impl SpaceLinkCtxHandle {
}
#[wasm_bindgen(js_name = listPosts)]
- pub async fn list_posts(&self) -> Result<JsValue, Error> {
+ pub async fn list_posts(&self) -> Result<<PostPage as Tsify>::JsType, Error> {
let page = self.inner.list_posts().await?;
let mut items = Vec::with_capacity(page.items.len());
for post in page.items {
@@ -786,10 +910,11 @@ impl SpaceLinkCtxHandle {
Err(error) => return Err(error),
}
}
- swb::to_value(&PostPageJs {
+ PostPage {
items,
next_cursor: page.next_cursor,
- })
+ }
+ .into_js()
.map_err(Into::into)
}
@@ -863,9 +988,9 @@ impl SpaceAccountCtxHandle {
pub async fn get_or_create_space_link(
&self,
space_id: String,
- ) -> Result<<CreatedSpaceLinkJs as Tsify>::JsType, Error> {
+ ) -> Result<<CreatedSpaceLink as Tsify>::JsType, Error> {
let value = self.inner.get_or_create_space_link(&space_id).await?;
- CreatedSpaceLinkJs {
+ CreatedSpaceLink {
space_id: value.space_id,
space_slug: value.space_slug,
access_key: value.access_key,
@@ -878,9 +1003,9 @@ impl SpaceAccountCtxHandle {
pub async fn rotate_space_link(
&self,
space_id: String,
- ) -> Result<<CreatedSpaceLinkJs as Tsify>::JsType, Error> {
+ ) -> Result<<CreatedSpaceLink as Tsify>::JsType, Error> {
let value = self.inner.rotate_space_link(&space_id).await?;
- CreatedSpaceLinkJs {
+ CreatedSpaceLink {
space_id: value.space_id,
space_slug: value.space_slug,
access_key: value.access_key,
@@ -895,7 +1020,7 @@ impl SpaceAccountCtxHandle {
space_slug: String,
profile: String,
referred_by_space_id: Option<String>,
- ) -> Result<<CreatedSpaceJs as Tsify>::JsType, Error> {
+ ) -> Result<<CreatedSpace as Tsify>::JsType, Error> {
created_space_to_js(
self.inner
.create_space_with_referrer(
@@ -910,8 +1035,15 @@ impl SpaceAccountCtxHandle {
}
#[wasm_bindgen(js_name = listOwnedSpaces)]
- pub async fn list_owned_spaces(&self) -> Result<JsValue, Error> {
- swb::to_value(&self.inner.list_owned_spaces().await?).map_err(Into::into)
+ pub async fn list_owned_spaces(
+ &self,
+ ) -> Result<Vec<<SpaceKeyResponse as Tsify>::JsType>, Error> {
+ self.inner
+ .list_owned_spaces()
+ .await?
+ .into_iter()
+ .map(|space| SpaceKeyResponse::from(space).into_js().map_err(Into::into))
+ .collect()
}
#[wasm_bindgen(js_name = getSpaceProfile)]
@@ -934,13 +1066,13 @@ impl SpaceAccountCtxHandle {
&self,
space_id: String,
profile: String,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &self
- .inner
+ ) -> Result<<UpdateSpaceProfileResponse as Tsify>::JsType, Error> {
+ UpdateSpaceProfileResponse::from(
+ self.inner
.update_space_profile(&space_id, profile.as_bytes(), None, false)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -950,7 +1082,7 @@ impl SpaceAccountCtxHandle {
space_id: String,
profile: String,
avatar_bytes: Vec<u8>,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<UpdateSpaceProfileResponse as Tsify>::JsType, Error> {
let space_key = self
.inner
.resolve_owned_space_key(&space_id)
@@ -964,12 +1096,12 @@ impl SpaceAccountCtxHandle {
.inner
.upload_avatar(&space_id, &space_key, &avatar_bytes)
.await?;
- swb::to_value(
- &self
- .inner
+ UpdateSpaceProfileResponse::from(
+ self.inner
.update_space_profile(&space_id, profile.as_bytes(), Some(avatar), false)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -979,7 +1111,7 @@ impl SpaceAccountCtxHandle {
space_id: String,
profile: String,
cover_bytes: Vec<u8>,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<UpdateSpaceProfileResponse as Tsify>::JsType, Error> {
let space_key = self
.inner
.resolve_owned_space_key(&space_id)
@@ -993,9 +1125,8 @@ impl SpaceAccountCtxHandle {
.inner
.upload_cover(&space_id, &space_key, &cover_bytes)
.await?;
- swb::to_value(
- &self
- .inner
+ UpdateSpaceProfileResponse::from(
+ self.inner
.update_space_profile_assets(
&space_id,
profile.as_bytes(),
@@ -1006,6 +1137,7 @@ impl SpaceAccountCtxHandle {
)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -1014,28 +1146,24 @@ impl SpaceAccountCtxHandle {
&self,
space_id: String,
space_slug: String,
- ) -> Result<JsValue, Error> {
- swb::to_value(&self.inner.update_space_slug(&space_id, &space_slug).await?)
+ ) -> Result<<SpaceLookupResponse as Tsify>::JsType, Error> {
+ SpaceLookupResponse::from(self.inner.update_space_slug(&space_id, &space_slug).await?)
+ .into_js()
.map_err(Into::into)
}
- #[wasm_bindgen(js_name = lookupSpaceBySlug)]
- pub async fn lookup_space_by_slug(&self, space_slug: String) -> Result<JsValue, Error> {
- swb::to_value(&self.inner.lookup_space_by_slug(&space_slug).await?).map_err(Into::into)
- }
-
#[wasm_bindgen(js_name = getRelationship)]
pub async fn get_relationship(
&self,
space_id: String,
target_space_id: String,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &self
- .inner
+ ) -> Result<<FriendRelationshipResponse as Tsify>::JsType, Error> {
+ FriendRelationshipResponse::from(
+ self.inner
.get_relationship(&space_id, &target_space_id)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -1044,13 +1172,13 @@ impl SpaceAccountCtxHandle {
&self,
space_id: String,
space_username: String,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &self
- .inner
+ ) -> Result<<FriendStatusResponse as Tsify>::JsType, Error> {
+ FriendStatusResponse::from(
+ self.inner
.request_friend_by_username(&space_id, &space_username)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -1060,14 +1188,22 @@ impl SpaceAccountCtxHandle {
space_id: String,
cursor: Option<String>,
limit: Option<i32>,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<PostPage as Tsify>::JsType, Error> {
let page = self.inner.list_feed(&space_id, cursor, limit).await?;
- swb::to_value(&account_post_page_to_js(&self.inner, page).await?).map_err(Into::into)
+ account_post_page_to_js(&self.inner, page)
+ .await?
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = unreadStatus)]
- pub async fn unread_status(&self, space_id: String) -> Result<JsValue, Error> {
- swb::to_value(&self.inner.unread_status(&space_id).await?).map_err(Into::into)
+ pub async fn unread_status(
+ &self,
+ space_id: String,
+ ) -> Result<<SpaceUnreadStatusResponse as Tsify>::JsType, Error> {
+ SpaceUnreadStatusResponse::from(self.inner.unread_status(&space_id).await?)
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = markNotificationsRead)]
@@ -1075,13 +1211,13 @@ impl SpaceAccountCtxHandle {
&self,
space_id: String,
friend_space_id: String,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &self
- .inner
+ ) -> Result<<SpaceUnreadStatusResponse as Tsify>::JsType, Error> {
+ SpaceUnreadStatusResponse::from(
+ self.inner
.mark_notifications_read(space_id, friend_space_id)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -1092,16 +1228,15 @@ impl SpaceAccountCtxHandle {
viewer_space_id: Option<String>,
cursor: Option<String>,
limit: Option<i32>,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &account_post_page_to_js(
- &self.inner,
- self.inner
- .list_posts(&space_id, viewer_space_id.as_deref(), cursor, limit)
- .await?,
- )
- .await?,
+ ) -> Result<<PostPage as Tsify>::JsType, Error> {
+ account_post_page_to_js(
+ &self.inner,
+ self.inner
+ .list_posts(&space_id, viewer_space_id.as_deref(), cursor, limit)
+ .await?,
)
+ .await?
+ .into_js()
.map_err(Into::into)
}
@@ -1111,7 +1246,7 @@ impl SpaceAccountCtxHandle {
space_id: String,
post_id: i64,
viewer_space_id: Option<String>,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<PostResponse as Tsify>::JsType, Error> {
let post = self
.inner
.get_post(&space_id, post_id, viewer_space_id.as_deref())
@@ -1120,7 +1255,10 @@ impl SpaceAccountCtxHandle {
.inner
.decrypt_post_for_viewer(&post.space_id, viewer_space_id.as_deref(), &post)
.await?;
- swb::to_value(&account_post_to_js(&self.inner, post, decrypted).await?).map_err(Into::into)
+ account_post_to_js(&self.inner, post, decrypted)
+ .await?
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = createPhotoPost)]
@@ -1129,9 +1267,9 @@ impl SpaceAccountCtxHandle {
space_id: String,
photo_bytes: Vec<u8>,
caption: Option<String>,
- photo_options: JsValue,
- ) -> Result<JsValue, Error> {
- let photo_options: PostPhotoAssetOptionsJsInput = swb::from_value(photo_options)?;
+ photo_options: <PostPhotoAssetOptions as Tsify>::JsType,
+ ) -> Result<<PostResponse as Tsify>::JsType, Error> {
+ let photo_options = PostPhotoAssetOptions::from_js(photo_options)?;
let post_key = self.inner.generate_post_key();
let object = self
.inner
@@ -1139,7 +1277,7 @@ impl SpaceAccountCtxHandle {
&space_id,
&post_key,
&photo_bytes,
- PostPhotoAssetOptions {
+ ente_space::PostPhotoAssetOptions {
width: photo_options.width,
height: photo_options.height,
media_type: photo_options.media_type,
@@ -1164,20 +1302,9 @@ impl SpaceAccountCtxHandle {
.inner
.decrypt_post_for_viewer(&post.space_id, Some(&space_id), &post)
.await?;
- swb::to_value(&account_post_to_js(&self.inner, post, decrypted).await?).map_err(Into::into)
- }
-
- #[wasm_bindgen(js_name = downloadPostAsset)]
- pub async fn download_post_asset(
- &self,
- space_id: String,
- post_id: i64,
- viewer_space_id: Option<String>,
- object_key: String,
- ) -> Result<Vec<u8>, Error> {
- self.inner
- .download_post_asset(&space_id, post_id, viewer_space_id.as_deref(), &object_key)
- .await
+ account_post_to_js(&self.inner, post, decrypted)
+ .await?
+ .into_js()
.map_err(Into::into)
}
@@ -1248,8 +1375,10 @@ impl SpaceAccountCtxHandle {
space_id: String,
post_id: i64,
like: bool,
- ) -> Result<JsValue, Error> {
- swb::to_value(&self.inner.like_post(&space_id, post_id, like).await?).map_err(Into::into)
+ ) -> Result<<LikePostResponse as Tsify>::JsType, Error> {
+ LikePostResponse::from(self.inner.like_post(&space_id, post_id, like).await?)
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = sendMessage)]
@@ -1258,7 +1387,7 @@ impl SpaceAccountCtxHandle {
sender_space_id: String,
space_id: String,
text: String,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<MessageResponse as Tsify>::JsType, Error> {
let message = self
.inner
.send_message(&sender_space_id, &space_id, &text)
@@ -1267,7 +1396,9 @@ impl SpaceAccountCtxHandle {
.inner
.decrypt_message(&sender_space_id, &message)
.await?;
- swb::to_value(&account_message_to_js(message, decrypted)?).map_err(Into::into)
+ account_message_to_js(message, decrypted)?
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = sendPoke)]
@@ -1275,13 +1406,15 @@ impl SpaceAccountCtxHandle {
&self,
sender_space_id: String,
space_id: String,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<MessageResponse as Tsify>::JsType, Error> {
let message = self.inner.send_poke(&sender_space_id, &space_id).await?;
let decrypted = self
.inner
.decrypt_message(&sender_space_id, &message)
.await?;
- swb::to_value(&account_message_to_js(message, decrypted)?).map_err(Into::into)
+ account_message_to_js(message, decrypted)?
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = replyToMessage)]
@@ -1291,7 +1424,7 @@ impl SpaceAccountCtxHandle {
space_id: String,
message_id: String,
text: String,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<MessageResponse as Tsify>::JsType, Error> {
let message = self
.inner
.reply_to_message(&sender_space_id, &space_id, &message_id, &text)
@@ -1300,7 +1433,9 @@ impl SpaceAccountCtxHandle {
.inner
.decrypt_message(&sender_space_id, &message)
.await?;
- swb::to_value(&account_message_to_js(message, decrypted)?).map_err(Into::into)
+ account_message_to_js(message, decrypted)?
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = replyToPost)]
@@ -1310,7 +1445,7 @@ impl SpaceAccountCtxHandle {
post_space_id: String,
post_id: i64,
text: String,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<MessageResponse as Tsify>::JsType, Error> {
let message = self
.inner
.reply_to_post(&sender_space_id, &post_space_id, post_id, &text)
@@ -1319,7 +1454,9 @@ impl SpaceAccountCtxHandle {
.inner
.decrypt_message(&sender_space_id, &message)
.await?;
- swb::to_value(&account_message_to_js(message, decrypted)?).map_err(Into::into)
+ account_message_to_js(message, decrypted)?
+ .into_js()
+ .map_err(Into::into)
}
#[wasm_bindgen(js_name = likeMessage)]
@@ -1328,13 +1465,13 @@ impl SpaceAccountCtxHandle {
space_id: String,
message_id: String,
like: bool,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &self
- .inner
+ ) -> Result<<LikeMessageResponse as Tsify>::JsType, Error> {
+ LikeMessageResponse::from(
+ self.inner
.like_message(&space_id, &message_id, like)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -1347,11 +1484,14 @@ impl SpaceAccountCtxHandle {
}
#[wasm_bindgen(js_name = listConversations)]
- pub async fn list_conversations(&self, space_id: String) -> Result<JsValue, Error> {
+ pub async fn list_conversations(
+ &self,
+ space_id: String,
+ ) -> Result<<ConversationsResponse as Tsify>::JsType, Error> {
let response = self.inner.list_conversations(&space_id).await?;
let mut friends = Vec::with_capacity(response.friends.len());
for friend in response.friends {
- friends.push(FriendJs {
+ friends.push(SpaceFriendResponse {
friend: account_actor_to_js(&self.inner, friend.friend).await?,
share_key_version: friend.share_key_version,
created_at: friend.created_at,
@@ -1360,7 +1500,7 @@ impl SpaceAccountCtxHandle {
let mut pending_requests = Vec::with_capacity(response.pending_requests.len());
for request in response.pending_requests {
- pending_requests.push(FriendRequestJs {
+ pending_requests.push(SpaceFriendRequestResponse {
request_id: request.request_id,
requester: public_actor_to_js(request.requester)?,
created_at: request.created_at,
@@ -1378,7 +1518,7 @@ impl SpaceAccountCtxHandle {
}
chat_summaries.insert(
friend_space_id,
- ConversationChatSummaryJs {
+ ConversationChatSummaryResponse {
latest_activity: resilient_message_conversation_activity_to_js(
&self.inner,
&space_id,
@@ -1390,12 +1530,13 @@ impl SpaceAccountCtxHandle {
);
}
- swb::to_value(&ConversationsJs {
+ ConversationsResponse {
friends,
pending_requests,
chat_summaries,
latest_post_created_at: response.latest_post_created_at,
- })
+ }
+ .into_js()
.map_err(Into::into)
}
@@ -1406,7 +1547,7 @@ impl SpaceAccountCtxHandle {
space_id: String,
cursor: Option<String>,
limit: Option<i32>,
- ) -> Result<JsValue, Error> {
+ ) -> Result<<MessagePage as Tsify>::JsType, Error> {
let page = self
.inner
.list_message_thread(&viewer_space_id, &space_id, cursor, limit)
@@ -1418,10 +1559,11 @@ impl SpaceAccountCtxHandle {
.await?,
);
}
- swb::to_value(&MessagePageJs {
+ MessagePage {
items,
next_cursor: page.next_cursor,
- })
+ }
+ .into_js()
.map_err(Into::into)
}
@@ -1460,45 +1602,63 @@ impl SpaceAccountCtxHandle {
}
#[wasm_bindgen(js_name = listSpaceFriends)]
- pub async fn list_space_friends(&self, space_id: String) -> Result<JsValue, Error> {
+ pub async fn list_space_friends(
+ &self,
+ space_id: String,
+ ) -> Result<Vec<<SpaceFriendResponse as Tsify>::JsType>, Error> {
let friends = self.inner.list_space_friends(&space_id).await?;
let mut items = Vec::with_capacity(friends.len());
for friend in friends {
- items.push(FriendJs {
- friend: account_actor_to_js(&self.inner, friend.friend).await?,
- share_key_version: friend.share_key_version,
- created_at: friend.created_at,
- });
+ items.push(
+ SpaceFriendResponse {
+ friend: account_actor_to_js(&self.inner, friend.friend).await?,
+ share_key_version: friend.share_key_version,
+ created_at: friend.created_at,
+ }
+ .into_js()?,
+ );
}
- swb::to_value(&items).map_err(Into::into)
+ Ok(items)
}
#[wasm_bindgen(js_name = listFriendRequests)]
- pub async fn list_friend_requests(&self, space_id: String) -> Result<JsValue, Error> {
+ pub async fn list_friend_requests(
+ &self,
+ space_id: String,
+ ) -> Result<Vec<<SpaceFriendRequestResponse as Tsify>::JsType>, Error> {
let requests = self.inner.list_friend_requests(&space_id).await?;
let mut items = Vec::with_capacity(requests.len());
for request in requests {
- items.push(FriendRequestJs {
- request_id: request.request_id,
- requester: public_actor_to_js(request.requester)?,
- created_at: request.created_at,
- });
+ items.push(
+ SpaceFriendRequestResponse {
+ request_id: request.request_id,
+ requester: public_actor_to_js(request.requester)?,
+ created_at: request.created_at,
+ }
+ .into_js()?,
+ );
}
- swb::to_value(&items).map_err(Into::into)
+ Ok(items)
}
#[wasm_bindgen(js_name = listSentFriendRequests)]
- pub async fn list_sent_friend_requests(&self, space_id: String) -> Result<JsValue, Error> {
+ pub async fn list_sent_friend_requests(
+ &self,
+ space_id: String,
+ ) -> Result<Vec<<SpaceSentFriendRequestResponse as Tsify>::JsType>, Error> {
let requests = self.inner.list_sent_friend_requests(&space_id).await?;
let mut items = Vec::with_capacity(requests.len());
for request in requests {
- items.push(SentFriendRequestJs {
- request_id: request.request_id,
- target: public_actor_to_js(request.target)?,
- created_at: request.created_at,
- });
+ items.push(
+ SpaceSentFriendRequestResponse {
+ request_id: request.request_id,
+ target: public_actor_to_js(request.target)?,
+ created_at: request.created_at,
+ }
+ .into_js()?,
+ );
}
- swb::to_value(&items).map_err(Into::into)
+ Ok(items)
}
#[wasm_bindgen(js_name = confirmFriendRequest)]
@@ -1506,13 +1666,13 @@ impl SpaceAccountCtxHandle {
&self,
space_id: String,
request_id: i64,
- ) -> Result<JsValue, Error> {
- swb::to_value(
- &self
- .inner
+ ) -> Result<<FriendStatusResponse as Tsify>::JsType, Error> {
+ FriendStatusResponse::from(
+ self.inner
.confirm_friend_request(&space_id, request_id)
.await?,
)
+ .into_js()
.map_err(Into::into)
}
@@ -1539,19 +1699,6 @@ impl SpaceAccountCtxHandle {
.await
.map_err(Into::into)
}
-
- #[wasm_bindgen(js_name = listFriendShares)]
- pub async fn list_friend_shares(&self, space_id: String) -> Result<JsValue, Error> {
- swb::to_value(&self.inner.list_friend_shares(&space_id).await?).map_err(Into::into)
- }
-
- #[wasm_bindgen(js_name = refreshFriendShares)]
- pub async fn refresh_friend_shares(&self, space_id: String) -> Result<usize, Error> {
- self.inner
- .refresh_friend_shares(&space_id)
- .await
- .map_err(Into::into)
- }
}
#[cfg(test)]
@@ -1560,12 +1707,12 @@ mod tests {
use super::*;
- fn post(post_id: i64, encrypted_post_key: String) -> PostResponse {
- PostResponse {
+ fn post(post_id: i64, encrypted_post_key: String) -> ente_space::PostResponse {
+ ente_space::PostResponse {
post_id,
space_id: "space-1".into(),
space_slug: "alice".into(),
- author: SpaceActorResponse {
+ author: ente_space::SpaceActorResponse {
space_id: "space-1".into(),
space_slug: "alice".into(),
..Default::default()
@@ -1583,8 +1730,8 @@ mod tests {
message_id: &str,
encrypted_message_key: &str,
message_cipher: &str,
- ) -> MessageResponse {
- MessageResponse {
+ ) -> ente_space::MessageResponse {
+ ente_space::MessageResponse {
message_id: message_id.into(),
kind: "regular".into(),
sender_space_id: "space-2".into(),
@@ -1608,11 +1755,11 @@ mod tests {
let space_key = Key::generate();
let wrapped_space_key = secretbox::encrypt_combined(space_key.as_bytes(), &root_key);
let valid_post_key = secretbox::encrypt_combined(Key::generate().as_bytes(), &space_key);
- let ctx = AccountSpaceCtx::open(OpenAccountSpaceCtxInput {
+ let ctx = AccountSpaceCtx::open(ente_space::OpenAccountSpaceCtxInput {
base_url: "http://localhost".into(),
space_session_token: None,
space_root_key: root_key.as_bytes().to_vec(),
- initial_owned_spaces: Some(vec![SpaceKeyResponse {
+ initial_owned_spaces: Some(vec![ente_space::SpaceKeyResponse {
space_id: "space-1".into(),
space_slug: "alice".into(),
root_wrapped_space_key: b64::encode(&wrapped_space_key),
@@ -1655,11 +1802,11 @@ mod tests {
let secret_key = SecretKey::generate();
let public_key = secret_key.public_key();
let encrypted_secret_key = secretbox::encrypt_combined(secret_key.as_bytes(), &root_key);
- let ctx = AccountSpaceCtx::open(OpenAccountSpaceCtxInput {
+ let ctx = AccountSpaceCtx::open(ente_space::OpenAccountSpaceCtxInput {
base_url: "http://localhost".into(),
space_session_token: None,
space_root_key: root_key.as_bytes().to_vec(),
- initial_owned_spaces: Some(vec![SpaceKeyResponse {
+ initial_owned_spaces: Some(vec![ente_space::SpaceKeyResponse {
space_id: "space-1".into(),
space_slug: "alice".into(),
root_wrapped_space_key: String::new(),
@@ -1704,7 +1851,7 @@ mod tests {
let mut response = message("message-1", &encrypted_message_key, &cipher);
response.kind = server_kind.into();
response.reply_post_id = (server_kind == "post_reply").then_some(42);
- let activity = MessageConversationActivity {
+ let activity = ente_space::MessageConversationActivity {
id: "activity-1".into(),
activity_type: if server_kind == "post_reply" {
"post_reply".into()
@@ -1784,7 +1931,7 @@ mod tests {
assert!(corrupt.is_unavailable);
assert!(!last.is_unavailable);
- let activity = MessageConversationActivity {
+ let activity = ente_space::MessageConversationActivity {
id: "activity-1".into(),
activity_type: "message".into(),
kind: "regular".into(),
diff --git a/web/apps/space/src/services/persistent-session.ts b/web/apps/space/src/services/persistent-session.ts
index 78dd30bb6b..297d1b3db0 100644
--- a/web/apps/space/src/services/persistent-session.ts
+++ b/web/apps/space/src/services/persistent-session.ts
@@ -17,6 +17,7 @@ import { removeAuthToken } from "ente-base/token";
import {
decryptSpaceRootEntityKey,
encryptSpaceRootEntityKey,
+ type SpaceKeyResponse,
} from "ente-space-wasm";
import { spaceBootstrapAuthHeaders } from "services/bootstrap-auth";
import {
@@ -39,7 +40,6 @@ const OwnedSpace = z.object({
keyVersion: z.number(),
});
const OwnedSpaces = OwnedSpace.array();
-export type OwnedSpace = z.infer<typeof OwnedSpace>;
const SpaceProfileAvatar = z.object({
keyVersion: z.number(),
@@ -133,7 +133,7 @@ export const savedSpaceProfileAvatar = () =>
export const saveSpaceOwnedSpaces = (
sessionToken: string,
- ownedSpaces: OwnedSpace[],
+ ownedSpaces: SpaceKeyResponse[],
) => {
const persisted = savedPersistedSession();
if (persisted?.sessionToken != sessionToken) return;
diff --git a/web/apps/space/src/services/profile.ts b/web/apps/space/src/services/profile.ts
index b20f8f684b..0118ebcbf7 100644
--- a/web/apps/space/src/services/profile.ts
+++ b/web/apps/space/src/services/profile.ts
@@ -6,6 +6,8 @@ import {
openSpaceAccountContext,
type DecryptedSpaceProfile,
type SpaceAccountCtxHandle,
+ type SpaceKeyResponse,
+ type UpdateSpaceProfileResponse,
} from "ente-space-wasm";
import type {
SetupProfile,
@@ -24,7 +26,6 @@ import {
savedSpaceSessionToken,
saveSpaceOwnedSpaces,
saveSpaceProfileAvatar,
- type OwnedSpace,
} from "services/persistent-session";
import {
parseSpaceProfilePayload,
@@ -45,16 +46,6 @@ interface SpaceAvatar {
type SpaceCover = SpaceAvatar;
-interface SpaceLookup {
- spaceId: string;
- spaceSlug: string;
-}
-
-interface UpdateSpaceProfileResponse {
- avatar?: SpaceAvatar;
- cover?: SpaceCover;
-}
-
export type UsernameAvailability = "available" | "taken";
export const normalizeSpaceUsername = (username: string) =>
@@ -87,7 +78,7 @@ const spaceProfilePayloadFor = (profile: SetupProfileInput) =>
export const isSpaceSessionUnauthorized = (error: unknown) =>
isNamedError(error, "session_unauthorized");
-const defaultOwnedSpace = (spaces: OwnedSpace[]) => spaces[0];
+const defaultOwnedSpace = (spaces: SpaceKeyResponse[]) => spaces[0];
const currentSpaceContextConfig = async () => {
const sessionRestore = restoreSpaceBrowserSessionIfNeeded();
@@ -118,9 +109,11 @@ let currentSpaceContext:
let pendingCurrentSpaceContext:
| { cacheKey: string; promise: Promise<SpaceAccountCtxHandle> }
| undefined;
-let currentOwnedSpace: { cacheKey: string; space: OwnedSpace } | undefined;
+let currentOwnedSpace:
+ | { cacheKey: string; space: SpaceKeyResponse }
+ | undefined;
let pendingCurrentOwnedSpace:
- | { cacheKey: string; promise: Promise<OwnedSpace | undefined> }
+ | { cacheKey: string; promise: Promise<SpaceKeyResponse | undefined> }
| undefined;
let currentSpaceProfile:
| { cacheKey: string; profile: SetupProfile | null }
@@ -133,7 +126,7 @@ let currentSpaceContextGeneration = 0;
const cloneSetupProfile = (profile: SetupProfile | null) =>
profile ? { ...profile } : null;
-const cloneOwnedSpace = (space: OwnedSpace | undefined) =>
+const cloneOwnedSpace = (space: SpaceKeyResponse | undefined) =>
space ? { ...space } : undefined;
export const openCurrentSpaceContext = async () => {
@@ -205,7 +198,7 @@ const loadAndPersistOwnedSpaces = async (
ctx: SpaceAccountCtxHandle,
sessionToken: string,
) => {
- const spaces = (await ctx.listOwnedSpaces()) as OwnedSpace[];
+ const spaces = await ctx.listOwnedSpaces();
saveSpaceOwnedSpaces(sessionToken, spaces);
return spaces;
};
@@ -468,7 +461,7 @@ export const saveSpaceProfile = async (
const ctx = await ensureCurrentSpaceContext();
try {
- const spaces = (await ctx.listOwnedSpaces()) as OwnedSpace[];
+ const spaces = await ctx.listOwnedSpaces();
const sessionToken = savedSpaceSessionToken();
if (sessionToken) saveSpaceOwnedSpaces(sessionToken, spaces);
const existingSpace =
@@ -491,10 +484,10 @@ export const saveSpaceProfile = async (
spaceId = existingSpace.spaceId;
spaceSlug = existingSpace.spaceSlug;
if (normalizeSpaceUsername(spaceSlug) != username) {
- const updatedSlug = (await ctx.updateSpaceSlug(
+ const updatedSlug = await ctx.updateSpaceSlug(
spaceId,
username,
- )) as SpaceLookup;
+ );
spaceSlug = updatedSlug.spaceSlug;
}
} else {
@@ -505,7 +498,7 @@ export const saveSpaceProfile = async (
);
spaceId = created.spaceId;
spaceSlug = created.spaceSlug;
- const createdSpaces = (await ctx.listOwnedSpaces()) as OwnedSpace[];
+ const createdSpaces = await ctx.listOwnedSpaces();
if (sessionToken) {
saveSpaceOwnedSpaces(sessionToken, createdSpaces);
}
@@ -517,11 +510,11 @@ export const saveSpaceProfile = async (
const avatarBytes = new Uint8Array(
await profile.avatarFile.arrayBuffer(),
);
- updateResponse = (await ctx.updateSpaceProfileWithAvatar(
+ updateResponse = await ctx.updateSpaceProfileWithAvatar(
spaceId,
profilePayload,
avatarBytes,
- )) as UpdateSpaceProfileResponse;
+ );
avatarUrl = updateResponse.avatar?.objectID
? await rememberCachedSpaceMediaBlobURL(
spaceProfileMediaCacheKey(
@@ -537,11 +530,11 @@ export const saveSpaceProfile = async (
const coverBytes = new Uint8Array(
await profile.coverFile.arrayBuffer(),
);
- updateResponse = (await ctx.updateSpaceProfileWithCover(
+ updateResponse = await ctx.updateSpaceProfileWithCover(
spaceId,
profilePayload,
coverBytes,
- )) as UpdateSpaceProfileResponse;
+ );
coverUrl = updateResponse.cover?.objectID
? await rememberCachedSpaceMediaBlobURL(
spaceProfileMediaCacheKey(
@@ -554,10 +547,10 @@ export const saveSpaceProfile = async (
)
: URL.createObjectURL(profile.coverFile);
} else if (existingSpace) {
- updateResponse = (await ctx.updateSpaceProfile(
+ updateResponse = await ctx.updateSpaceProfile(
spaceId,
profilePayload,
- )) as UpdateSpaceProfileResponse;
+ );
}
const savedProfile = {
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index ab40b598eb..c3deccbc7f 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -6,7 +6,13 @@ import { apiOrigin } from "ente-base/origins";
import {
openSpaceLinkContext,
type DecryptedSpaceProfile,
+ type MessageConversationActivity,
+ type MessageResponse,
+ type PostObjectPayload,
+ type PostPage,
+ type PostResponse,
type SpaceAccountCtxHandle,
+ type SpaceActorResponse,
type SpaceLinkCtxHandle,
} from "ente-space-wasm";
import {
@@ -48,127 +54,6 @@ interface SpaceAvatar {
type SpaceCover = SpaceAvatar;
-interface SpaceActor {
- avatar?: SpaceAvatar;
- profile?: string;
- publicKey?: string;
- spaceId: string;
- spaceSlug: string;
-}
-
-interface SpacePostObject {
- height?: number;
- mediaType?: string;
- objectKey: string;
- size?: number;
- thumbHash?: string;
- width?: number;
-}
-
-interface SpacePostResponse {
- author: SpaceActor;
- caption?: string;
- createdAt: string;
- encryptedPostKey: string;
- keyVersion: number;
- objects?: SpacePostObject[];
- postId: number;
- viewerLiked: boolean;
- spaceId: string;
- spaceSlug: string;
- isUnavailable?: boolean;
-}
-
-interface SpacePostPageResponse {
- items?: SpacePostResponse[];
- nextCursor?: string;
-}
-
-type SpaceMessageConversationActivityType =
- | "empty"
- | "friend_request"
- | "friend_added"
- | "message"
- | "message_like"
- | "post_like"
- | "post_reply";
-
-interface SpaceMessageConversationActivity {
- createdAt: string;
- id: string;
- kind?: SpaceMessageKindResponse;
- messageId?: string;
- outgoing?: boolean;
- postId?: number;
- postSpaceId?: string;
- text?: string;
- type: SpaceMessageConversationActivityType;
- isUnavailable?: boolean;
-}
-
-interface SpaceFriend {
- createdAt: string;
- friend: SpaceActor;
- shareKeyVersion: number;
-}
-
-type SpaceMessageKindResponse =
- | "friend_added"
- | "poke"
- | "post_like"
- | "post_reply"
- | "regular";
-
-interface SpaceMessageResponse {
- createdAt: string;
- id?: string;
- isDeleted?: boolean;
- kind: SpaceMessageKindResponse;
- liked?: boolean;
- messageId: string;
- recipientSpaceId: string;
- replyMessageId?: string;
- replyPostId?: number;
- senderSpaceId: string;
- text: string;
- viewerLiked?: boolean;
- updatedAt: string;
- isUnavailable?: boolean;
-}
-
-interface SpaceMessagePageResponse {
- items?: SpaceMessageResponse[];
- nextCursor?: string;
-}
-
-interface SpaceFriendRequestResponse {
- requestId: number;
- requester: SpaceActor;
- createdAt: string;
-}
-
-interface SpaceSentFriendRequestResponse {
- requestId: number;
- target: SpaceActor;
- createdAt: string;
-}
-
-interface SpaceConversationChatSummaryResponse {
- latestActivity: SpaceMessageConversationActivity;
- unreadActivities?: SpaceMessageConversationActivity[];
-}
-
-type SpaceConversationChatSummaries =
- | Record<string, SpaceConversationChatSummaryResponse>
- | Map<string, SpaceConversationChatSummaryResponse>;
-
-interface SpaceConversationsResponse {
- chatSummaries?: SpaceConversationChatSummaries;
- friends?: SpaceFriend[];
- latestPostCreatedAt?: string | null;
- pendingRequests?: SpaceFriendRequestResponse[];
-}
-
interface SpacePostBase {
avatarKeyVersion?: number;
avatarObjectID?: string;
@@ -254,7 +139,7 @@ interface PublicSpaceIdentityResponse {
spaceSlug?: string;
}
-export type SpaceMessageKind = SpaceMessageKindResponse;
+export type SpaceMessageKind = MessageResponse["kind"];
export interface SpaceMessageQuote {
imageUrl?: string;
@@ -280,7 +165,7 @@ export interface SpaceMessage {
isUnavailable?: boolean;
}
-export type SpaceMessageActivityType = SpaceMessageConversationActivityType;
+export type SpaceMessageActivityType = MessageConversationActivity["type"];
export interface SpaceMessageActivityPost {
imageUrl?: string;
@@ -335,32 +220,6 @@ export interface SpaceUnreadStatus {
messagesUnread: boolean;
}
-interface SpaceUnreadStatusResponse {
- notificationsUnread: boolean;
-}
-
-interface SpaceFriendRequestContext {
- confirmFriendRequest: (
- spaceId: string,
- requestId: bigint,
- ) => Promise<unknown>;
- deleteFriendRequest: (spaceId: string, requestId: bigint) => Promise<void>;
- listFriendRequests: (
- spaceId: string,
- ) => Promise<SpaceFriendRequestResponse[]>;
- listSentFriendRequests: (
- spaceId: string,
- ) => Promise<SpaceSentFriendRequestResponse[]>;
- requestFriendByUsername: (
- spaceId: string,
- username: string,
- ) => Promise<unknown>;
-}
-
-interface SpaceConversationsContext {
- listConversations: (spaceId: string) => Promise<SpaceConversationsResponse>;
-}
-
export const isSpaceContentError = (error: unknown) =>
isNamedError(error, "content_unavailable");
@@ -392,14 +251,6 @@ const placeholderMessageActor = (spaceId: string): FriendProfile => ({
const friendSpaceId = (friend: FriendProfile) => friend.spaceId || friend.id;
-const conversationSummaryForFriend = (
- summaries: SpaceConversationChatSummaries | undefined,
- friendSpaceID: string,
-) =>
- summaries instanceof Map
- ? summaries.get(friendSpaceID)
- : summaries?.[friendSpaceID];
-
const messageActorForSpace = (
spaceId: string,
actors: SpaceMessageHydrationActors,
@@ -409,7 +260,7 @@ const messageActorForSpace = (
return placeholderMessageActor(spaceId);
};
-const actorProfile = (actor: SpaceActor): FriendProfile => {
+const actorProfile = (actor: SpaceActorResponse): FriendProfile => {
const payload = parseSpaceProfilePayload(actor.profile ?? "");
const fullName =
spaceProfileTextField(payload.fullName) ||
@@ -451,7 +302,7 @@ const profileFromSpaceProfile = (
coverObjectID: spaceProfile.cover?.objectID,
coverUpdatedAt: spaceProfile.cover?.updatedAt,
coverUrl: null,
- friendsCount: spaceProfile.friends ?? 0,
+ friendsCount: spaceProfile.friends,
fullName,
id: spaceProfile.spaceId || spaceProfile.spaceSlug,
username: spaceProfile.spaceSlug,
@@ -536,8 +387,8 @@ const cachedAccountAvatarURLIfPresent = async (
};
const postAssetFrom = (
- post: SpacePostResponse,
- object: SpacePostObject,
+ post: PostResponse,
+ object: PostObjectPayload,
): SpacePostAsset => ({
encryptedPostKey: post.encryptedPostKey,
keyVersion: post.keyVersion,
@@ -570,8 +421,8 @@ const accountPostAssetURLFromAsset = (
const accountPostAssetURL = (
ctx: SpaceAccountCtxHandle,
- post: SpacePostResponse,
- object: SpacePostObject,
+ post: PostResponse,
+ object: PostObjectPayload,
viewerSpaceId?: string,
) =>
accountPostAssetURLFromAsset(
@@ -581,19 +432,19 @@ const accountPostAssetURL = (
);
const cacheAccountPostAssetURL = async (
- post: SpacePostResponse,
- object: SpacePostObject,
+ post: PostResponse,
+ object: PostObjectPayload,
blob: Blob,
) => {
const key = postAssetCacheKey(postAssetFrom(post, object));
await rememberCachedSpaceMediaBlobURL(key, blob);
};
-const firstObject = (post: { objects?: SpacePostObject[] }) =>
- post.objects?.find((object) => object.objectKey.trim()) ?? null;
+const firstObject = (post: PostResponse) =>
+ post.objects.find((object) => object.objectKey.trim()) ?? null;
const postBaseFromResponse = (
- post: SpacePostResponse,
+ post: PostResponse,
author: FriendProfile,
): SpacePostBase => ({
avatarKeyVersion: author.avatarKeyVersion,
@@ -614,7 +465,7 @@ const postBaseFromResponse = (
const postFromAccountPost = async (
ctx: SpaceAccountCtxHandle,
- post: SpacePostResponse,
+ post: PostResponse,
loadMedia = true,
viewerSpaceId?: string,
): Promise<SpacePost> => {
@@ -647,7 +498,7 @@ const postFromAccountPost = async (
};
};
-const profilePostFromPost = (post: SpacePostResponse): SpaceProfilePost => {
+const profilePostFromPost = (post: PostResponse): SpaceProfilePost => {
const object = firstObject(post);
const author = actorProfile(post.author);
const base = postBaseFromResponse(post, author);
@@ -664,10 +515,8 @@ const profilePostFromPost = (post: SpacePostResponse): SpaceProfilePost => {
};
};
-const profilePostPageFromPage = (
- page: SpacePostPageResponse,
-): SpaceProfilePostPage => ({
- items: (page.items ?? []).map(profilePostFromPost),
+const profilePostPageFromPage = (page: PostPage): SpaceProfilePostPage => ({
+ items: page.items.map(profilePostFromPost),
nextCursor: page.nextCursor || undefined,
});
@@ -742,9 +591,7 @@ export const openPublicSpaceLink = async (
return { avatarUrl, coverUrl };
},
loadPosts: async () =>
- profilePostPageFromPage(
- (await ctx.listPosts()) as SpacePostPageResponse,
- ).items,
+ profilePostPageFromPage(await ctx.listPosts()).items,
profile: { ...profile, avatarUrl: profile.avatarUrl ?? null },
postsCount: response.posts ?? 0,
subscribeWebPush: (endpoint, p256dh, auth) =>
@@ -780,7 +627,7 @@ export const rotateCurrentSpaceLink = () =>
const messageQuoteFromPostResponse = async (
ctx: SpaceAccountCtxHandle,
- post: SpacePostResponse,
+ post: PostResponse,
includeImage: boolean,
viewerSpaceId?: string,
): Promise<SpaceMessageQuote> => {
@@ -812,7 +659,7 @@ const messageQuoteFromPostResponse = async (
const messageQuoteFromReplyPost = async (
ctx: SpaceAccountCtxHandle,
- message: SpaceMessageResponse,
+ message: MessageResponse,
includeImage: boolean,
viewerSpaceId?: string,
): Promise<SpaceMessageQuote | undefined> => {
@@ -827,11 +674,11 @@ const messageQuoteFromReplyPost = async (
if (!includeImage) return fallbackQuote;
try {
- const post = (await ctx.getPost(
+ const post = await ctx.getPost(
message.recipientSpaceId,
BigInt(message.replyPostId),
viewerSpaceId ?? null,
- )) as SpacePostResponse;
+ );
return await messageQuoteFromPostResponse(
ctx,
post,
@@ -846,7 +693,7 @@ const messageQuoteFromReplyPost = async (
const messageQuoteFromSpaceMessage = async (
ctx: SpaceAccountCtxHandle,
- message: SpaceMessageResponse,
+ message: MessageResponse,
includeImage: boolean,
viewerSpaceId?: string,
): Promise<SpaceMessageQuote | undefined> =>
@@ -854,7 +701,7 @@ const messageQuoteFromSpaceMessage = async (
const messageFromSpaceMessage = async (
ctx: SpaceAccountCtxHandle,
- message: SpaceMessageResponse,
+ message: MessageResponse,
includeQuoteImage: boolean,
viewerSpaceId?: string,
actors?: SpaceMessageHydrationActors,
@@ -875,11 +722,11 @@ const messageFromSpaceMessage = async (
);
return {
createdAtMs: timestampMsFromSpaceDate(message.createdAt),
- id: message.messageId || message.id || message.createdAt,
- isDeleted: Boolean(message.isDeleted),
+ id: message.messageId || message.createdAt,
+ isDeleted: message.isDeleted,
isUnavailable: message.isUnavailable,
kind: message.kind,
- liked: Boolean(message.liked),
+ liked: message.liked,
quote,
recipient,
replyMessageId: message.replyMessageId,
@@ -887,12 +734,12 @@ const messageFromSpaceMessage = async (
sender,
text: message.text,
updatedAtMs: timestampMsFromSpaceDate(message.updatedAt),
- viewerLiked: Boolean(message.viewerLiked),
+ viewerLiked: message.viewerLiked,
};
};
const messageActivityPostFromActivity = (
- activity: SpaceMessageConversationActivity,
+ activity: MessageConversationActivity,
): SpaceMessageActivityPost | undefined => {
if (typeof activity.postId != "number" || !activity.postSpaceId) {
return undefined;
@@ -907,12 +754,11 @@ export const loadCurrentMessageActivityPostPreview = async (
if (post.isDeleted) return post;
const ctx = await ensureCurrentSpaceContext();
try {
- const response = (await ctx.getPost(
+ const response = await ctx.getPost(
post.spaceId,
BigInt(post.postId),
viewerSpaceId ?? null,
- )) as SpacePostResponse | null;
- if (!response) return post;
+ );
const quote = await messageQuoteFromPostResponse(
ctx,
response,
@@ -930,7 +776,7 @@ export const loadCurrentMessageActivityPostPreview = async (
};
const messageActivityFromSpaceActivity = (
- activity: SpaceMessageConversationActivity,
+ activity: MessageConversationActivity,
): SpaceMessageActivity => {
const post = messageActivityPostFromActivity(activity);
return {
@@ -938,7 +784,7 @@ const messageActivityFromSpaceActivity = (
id: activity.id,
kind: activity.kind || undefined,
messageId: activity.messageId,
- outgoing: Boolean(activity.outgoing),
+ outgoing: activity.outgoing,
post,
text: activity.text?.trim() || undefined,
type: activity.type,
@@ -986,11 +832,10 @@ export const requestFriendByUsername = async ({
if (!spaceId) throw new Error("Missing space.");
const ctx = await ensureCurrentSpaceContext();
try {
- const response = (await (
- ctx as SpaceFriendRequestContext
- ).requestFriendByUsername(spaceId, spaceUsername)) as {
- status?: string;
- };
+ const response = await ctx.requestFriendByUsername(
+ spaceId,
+ spaceUsername,
+ );
return response.status == "friend" ? "friend" : "requested";
} finally {
releaseCurrentSpaceContext(ctx);
@@ -999,10 +844,7 @@ export const requestFriendByUsername = async ({
export const loadCurrentSpaceRelationship = (targetSpaceId: string) =>
withCurrentSpaceContext(async (ctx, spaceId) => {
- const response = (await ctx.getRelationship(
- spaceId,
- targetSpaceId,
- )) as { relationship?: string };
+ const response = await ctx.getRelationship(spaceId, targetSpaceId);
return response.relationship == "self"
? "self"
: response.relationship == "friend"
@@ -1031,7 +873,7 @@ export const loadCurrentSpaceFriends = async (spaceId: string) => {
const ctx = await ensureCurrentSpaceContext();
const promise = (async () => {
- const friends = (await ctx.listSpaceFriends(spaceId)) as SpaceFriend[];
+ const friends = await ctx.listSpaceFriends(spaceId);
return friends.map(({ friend }) => actorProfile(friend));
})();
spaceFriendsCache.set(spaceId, promise);
@@ -1052,7 +894,7 @@ export const loadCurrentSpaceFriendsCount = async (spaceId: string) => {
const ctx = await ensureCurrentSpaceContext();
try {
const spaceProfile = await ctx.getSpaceProfile(spaceId, spaceId);
- return spaceProfile.friends ?? 0;
+ return spaceProfile.friends;
} finally {
releaseCurrentSpaceContext(ctx);
}
@@ -1063,10 +905,9 @@ export const loadCurrentFriendRequests = async (
): Promise<SpaceFriendRequest[]> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const requestContext = ctx as SpaceFriendRequestContext;
const [receivedRequests, sentRequests] = await Promise.all([
- requestContext.listFriendRequests(spaceId),
- requestContext.listSentFriendRequests(spaceId),
+ ctx.listFriendRequests(spaceId),
+ ctx.listSentFriendRequests(spaceId),
]);
return [
...receivedRequests.map((request) => ({
@@ -1139,15 +980,11 @@ export const loadCurrentFeedPage = async (
): Promise<SpacePostPage> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const page = (await ctx.listFeed(
- spaceId,
- cursor ?? null,
- 10,
- )) as SpacePostPageResponse;
+ const page = await ctx.listFeed(spaceId, cursor ?? null, 10);
await persistCurrentOwnedSpaces(ctx);
return {
items: await Promise.all(
- (page.items ?? []).map((post) =>
+ page.items.map((post) =>
postFromAccountPost(ctx, post, false, spaceId),
),
),
@@ -1163,9 +1000,7 @@ export const loadCurrentUnreadStatus = async (
): Promise<SpaceUnreadStatus> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const status = (await ctx.unreadStatus(
- spaceId,
- )) as SpaceUnreadStatusResponse;
+ const status = await ctx.unreadStatus(spaceId);
return { messagesUnread: status.notificationsUnread };
} finally {
releaseCurrentSpaceContext(ctx);
@@ -1177,13 +1012,8 @@ export const hasCurrentSpacePosts = async (
): Promise<boolean> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const page = (await ctx.listPosts(
- spaceId,
- spaceId,
- null,
- 1,
- )) as SpacePostPageResponse;
- return (page.items?.length ?? 0) > 0;
+ const page = await ctx.listPosts(spaceId, spaceId, null, 1);
+ return page.items.length > 0;
} finally {
releaseCurrentSpaceContext(ctx);
}
@@ -1197,12 +1027,12 @@ export const loadCurrentSpaceProfilePostsPage = async (
const ctx = await ensureCurrentSpaceContext();
try {
const page = profilePostPageFromPage(
- (await ctx.listPosts(
+ await ctx.listPosts(
spaceId,
viewerSpaceId ?? null,
cursor ?? null,
60,
- )) as SpacePostPageResponse,
+ ),
);
return page;
} finally {
@@ -1217,12 +1047,11 @@ export const loadCurrentSpacePost = async (
): Promise<SpacePost | null> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const response = (await ctx.getPost(
+ const response = await ctx.getPost(
spaceId,
BigInt(postId),
viewerSpaceId ?? null,
- )) as SpacePostResponse | null;
- if (!response) return null;
+ );
const post = await postFromAccountPost(
ctx,
response,
@@ -1337,17 +1166,17 @@ export const createCurrentPhotoPost = async ({
const bytes = new Uint8Array(await file.arrayBuffer());
const normalizedWidth = normalizedImageDimension(width);
const normalizedHeight = normalizedImageDimension(height);
- const created = (await ctx.createPhotoPost(
+ const created = await ctx.createPhotoPost(
spaceId,
bytes,
caption?.trim() || null,
{
width: normalizedWidth,
height: normalizedHeight,
- mediaType: file.type || null,
- thumbHash: thumbHash || null,
+ mediaType: file.type || undefined,
+ thumbHash: thumbHash || undefined,
},
- )) as SpacePostResponse;
+ );
const object = firstObject(created);
if (object) await cacheAccountPostAssetURL(created, object, file);
const post = await postFromAccountPost(ctx, created, true, spaceId);
@@ -1361,7 +1190,7 @@ export const createCurrentPhotoPost = async ({
const normalizedImageDimension = (dimension: number | undefined) =>
typeof dimension == "number" && Number.isFinite(dimension) && dimension > 0
? Math.round(dimension)
- : null;
+ : undefined;
export const setCurrentPostLiked = async (
spaceId: string,
@@ -1409,11 +1238,7 @@ export const sendCurrentMessage = async (
try {
return await messageFromSpaceMessage(
ctx,
- (await ctx.sendMessage(
- senderSpaceId,
- spaceId,
- messageText,
- )) as SpaceMessageResponse,
+ await ctx.sendMessage(senderSpaceId, spaceId, messageText),
true,
senderSpaceId,
{ friend: recipient, viewer: sender },
@@ -1433,10 +1258,7 @@ export const sendCurrentPoke = async (
try {
return await messageFromSpaceMessage(
ctx,
- (await ctx.sendPoke(
- senderSpaceId,
- spaceId,
- )) as SpaceMessageResponse,
+ await ctx.sendPoke(senderSpaceId, spaceId),
true,
senderSpaceId,
{ friend: recipient, viewer: sender },
@@ -1459,12 +1281,12 @@ export const replyToCurrentMessage = async (
try {
return await messageFromSpaceMessage(
ctx,
- (await ctx.replyToMessage(
+ await ctx.replyToMessage(
senderSpaceId,
spaceId,
messageId,
messageText,
- )) as SpaceMessageResponse,
+ ),
true,
senderSpaceId,
{ friend: recipient, viewer: sender },
@@ -1504,27 +1326,22 @@ export const loadCurrentMessageConversations = async (
): Promise<SpaceMessageConversationList> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const response = await (
- ctx as unknown as SpaceConversationsContext
- ).listConversations(spaceId);
+ const response = await ctx.listConversations(spaceId);
const summaries = response.chatSummaries;
const friendItems = await Promise.all(
- (response.friends ?? []).map(async (conversation) => {
+ response.friends.map(async (conversation) => {
const friend = actorProfile(conversation.friend);
const friendSpaceID = friendSpaceId(friend);
friend.avatarUrl = await cachedAccountAvatarURLIfPresent(
friendSpaceID,
conversation.friend.avatar,
);
- const summary = conversationSummaryForFriend(
- summaries,
- friendSpaceID,
- );
+ const summary = summaries.get(friendSpaceID);
const latestActivity = summary
? messageActivityFromSpaceActivity(summary.latestActivity)
: undefined;
const unreadActivities = summary
- ? (summary.unreadActivities ?? [])
+ ? summary.unreadActivities
.map(messageActivityFromSpaceActivity)
.map((activity) =>
activity.id == latestActivity?.id &&
@@ -1554,21 +1371,19 @@ export const loadCurrentMessageConversations = async (
};
}),
);
- const requestItems = (response.pendingRequests ?? []).map(
- (request) => ({
- friend: actorProfile(request.requester),
- latestActivity: {
- createdAtMs: timestampMsFromSpaceDate(request.createdAt),
- id: `friend_request:${request.requestId}`,
- outgoing: false,
- type: "friend_request" as const,
- },
- notificationUnread: true,
- unread: true,
- unreadActivities: [],
- unreadCount: 1,
- }),
- );
+ const requestItems = response.pendingRequests.map((request) => ({
+ friend: actorProfile(request.requester),
+ latestActivity: {
+ createdAtMs: timestampMsFromSpaceDate(request.createdAt),
+ id: `friend_request:${request.requestId}`,
+ outgoing: false,
+ type: "friend_request" as const,
+ },
+ notificationUnread: true,
+ unread: true,
+ unreadActivities: [],
+ unreadCount: 1,
+ }));
return {
items: [...requestItems, ...friendItems],
latestPostCreatedAtMs: response.latestPostCreatedAt
@@ -1616,10 +1431,7 @@ export const confirmCurrentFriendRequest = async (
) => {
const ctx = await ensureCurrentSpaceContext();
try {
- await (ctx as SpaceFriendRequestContext).confirmFriendRequest(
- spaceId,
- BigInt(requestId),
- );
+ await ctx.confirmFriendRequest(spaceId, BigInt(requestId));
clearSpaceFriendsCache();
await invalidateCachedSpaceFeed(spaceId);
} finally {
@@ -1633,10 +1445,7 @@ export const deleteCurrentFriendRequest = async (
) => {
const ctx = await ensureCurrentSpaceContext();
try {
- await (ctx as SpaceFriendRequestContext).deleteFriendRequest(
- spaceId,
- BigInt(requestId),
- );
+ await ctx.deleteFriendRequest(spaceId, BigInt(requestId));
} finally {
releaseCurrentSpaceContext(ctx);
}
@@ -1650,15 +1459,15 @@ export const loadCurrentMessageThread = async (
): Promise<SpaceMessagePage> => {
const ctx = await ensureCurrentSpaceContext();
try {
- const page = (await ctx.listMessageThread(
+ const page = await ctx.listMessageThread(
viewerSpaceId,
spaceId,
null,
100,
- )) as SpaceMessagePageResponse;
+ );
const items = (
await Promise.all(
- (page.items ?? []).map((message) =>
+ page.items.map((message) =>
messageFromSpaceMessage(
ctx,
message,
diff --git a/web/packages/wasm/space/index.ts b/web/packages/wasm/space/index.ts
index 2a5b0a52cd..b3fe14a97a 100644
--- a/web/packages/wasm/space/index.ts
+++ b/web/packages/wasm/space/index.ts
@@ -1,14 +1,23 @@
import type {
- OpenAccountSpaceCtxJsInput,
- OpenSpaceLinkCtxJsInput,
+ OpenAccountSpaceCtxInput,
+ OpenSpaceLinkCtxInput,
+ SpaceAccountCtxHandle,
+ SpaceLinkCtxHandle,
} from "./pkg/ente_space_wasm";
-export type { DecryptedSpaceProfile } from "./pkg/ente_space_wasm";
-
-export type SpaceAccountCtxHandle =
- import("./pkg/ente_space_wasm").SpaceAccountCtxHandle;
-export type SpaceLinkCtxHandle =
- import("./pkg/ente_space_wasm").SpaceLinkCtxHandle;
+export type {
+ DecryptedSpaceProfile,
+ MessageConversationActivity,
+ MessageResponse,
+ PostObjectPayload,
+ PostPage,
+ PostResponse,
+ SpaceAccountCtxHandle,
+ SpaceActorResponse,
+ SpaceKeyResponse,
+ SpaceLinkCtxHandle,
+ UpdateSpaceProfileResponse,
+} from "./pkg/ente_space_wasm";
const wasm = () => import("./pkg/ente_space_wasm");
@@ -23,9 +32,9 @@ export const decryptSpaceRootEntityKey = async (
) => (await wasm()).decryptSpaceRootEntityKey(encryptedKeyB64, masterKeyB64);
export const openSpaceAccountContext = async (
- input: OpenAccountSpaceCtxJsInput,
+ input: OpenAccountSpaceCtxInput,
): Promise<SpaceAccountCtxHandle> => (await wasm()).spaceOpenAccountCtx(input);
export const openSpaceLinkContext = async (
- input: OpenSpaceLinkCtxJsInput,
+ input: OpenSpaceLinkCtxInput,
): Promise<SpaceLinkCtxHandle> => (await wasm()).spaceOpenLinkCtx(input);