@spectrum-ts/imessage 5.0.0 → 5.1.0

package/dist/index.d.ts

@@ -161,7 +161,16 @@ interface RemoteClient {
   phone: string;
 }
 type IMessageClient = IMessageSDK | RemoteClient[];
-declare const userSchema: z.ZodObject<{}, z.core.$strip>;
+declare const userSchema: z.ZodObject<{
+  address: z.ZodOptional<z.ZodString>;
+  country: z.ZodOptional<z.ZodString>;
+  service: z.ZodOptional<z.ZodEnum<{
+    iMessage: "iMessage";
+    unknown: "unknown";
+    SMS: "SMS";
+    RCS: "RCS";
+  }>>;
+}, z.core.$strip>;
 declare const spaceSchema: z.ZodObject<{
   id: z.ZodString;
   type: z.ZodEnum<{

package/dist/index.js

@@ -186,7 +186,16 @@ const configSchema = z.union([z.object({ local: z.literal(true) }), z.object({
 	local: z.literal(false).optional().default(false),
 	clients: clientEntry.or(z.array(clientEntry)).optional()
 })]);
-z.object({});
+z.object({
+	address: z.string().optional(),
+	country: z.string().optional(),
+	service: z.enum([
+		"iMessage",
+		"SMS",
+		"RCS",
+		"unknown"
+	]).optional()
+});
 const spaceSchema = z.object({
 	id: z.string(),
 	type: z.enum(["dm", "group"]),
@@ -480,7 +489,10 @@ const toMessages = async (message) => {
 	if (message.reaction !== null || message.kind !== "text" || message.retractedAt !== null) return [];
 	if (isPendingAttachmentJoin(message)) return [];
 	const base = {
-		sender: { id: message.participant ?? "" },
+		sender: {
+			id: message.participant ?? "",
+			...message.participant ? { address: message.participant } : {}
+		},
 		space: {
 			id: chatId,
 			type: chatKind === "group" ? "group" : "dm",
@@ -764,7 +776,18 @@ const resolveChatGuid = (message, hint) => {
 	if (hint) return hint;
 	return message.chatGuids?.[0] ?? "";
 };
-const resolveSenderId = (message) => message.sender?.address ?? "";
+/**
+* Normalize an Apple address (`message.sender` or an event `actor`) into the
+* spectrum sender ref. `id` stays the cross-provider identity key (the
+* address); `address`/`country`/`service` are surfaced when present so apps
+* can tell iMessage from SMS/RCS. Empty fields are omitted.
+*/
+const toSenderRef = (addr) => ({
+	id: addr?.address ?? "",
+	...addr?.address ? { address: addr.address } : {},
+	...addr?.country ? { country: addr.country } : {},
+	...addr?.service ? { service: addr.service } : {}
+});
 const isIMessageMessage = (value) => {
 	if (typeof value !== "object" || value === null) return false;
 	const record = value;
@@ -778,7 +801,7 @@ const buildMessageBase = (message, chatGuidHint, timestamp, phone) => {
 	const chat = resolveChatGuid(message, chatGuidHint);
 	return {
 		direction: message.isFromMe ? "outbound" : "inbound",
-		sender: { id: resolveSenderId(message) },
+		sender: toSenderRef(message.sender),
 		space: {
 			id: chat,
 			type: chatTypeFromGuid(chat),
@@ -974,13 +997,12 @@ const resolveReactionTarget = async (client, cache, chat, targetGuid, partIndex,
 const toReactionMessages = async (client, cache, event, phone) => {
 	const emoji = reactionEmoji(event.reaction);
 	if (!emoji) return [];
-	const senderAddress = event.actor?.address;
-	if (!senderAddress) return [];
+	if (!event.actor?.address) return [];
 	const resolved = await resolveReactionTarget(client, cache, event.chatGuid, event.messageGuid, event.targetPartIndex, phone);
 	if (!resolved) return [];
 	const partSuffix = typeof event.targetPartIndex === "number" ? `:${event.targetPartIndex}` : "";
 	return [{
-		sender: { id: senderAddress },
+		sender: toSenderRef(event.actor),
 		space: {
 			id: event.chatGuid,
 			type: chatTypeFromGuid(event.chatGuid),
@@ -1609,8 +1631,8 @@ const buildPollOptionMessage = (input) => {
 	const action = input.selected ? "selected" : "deselected";
 	const eventTime = input.event.occurredAt.getTime();
 	return {
-		id: `${input.event.pollMessageGuid}:${input.senderAddress}:${input.optionId}:${action}:${eventTime}`,
-		sender: { id: input.senderAddress },
+		id: `${input.event.pollMessageGuid}:${input.sender.id}:${input.optionId}:${action}:${eventTime}`,
+		sender: input.sender,
 		space: {
 			id: input.chatGuid,
 			type: chatTypeFromGuid(input.chatGuid),
@@ -1630,9 +1652,9 @@ const refreshPollMetadata = async (client, pollCache, event) => {
 	return pollCache.get(info.pollMessageGuid);
 };
 const toPollOptionMessage = async (client, pollCache, event, phone) => {
-	const senderAddress = event.actor?.address;
+	const sender = toSenderRef(event.actor);
 	const optionId = event.delta.optionIdentifier;
-	if (!(senderAddress && optionId)) return [];
+	if (!(sender.id && optionId)) return [];
 	let cached = await resolvePoll(client, pollCache, event);
 	if (!cached) return [];
 	if (!cached.optionsByIdentifier.has(optionId)) {
@@ -1646,7 +1668,7 @@ const toPollOptionMessage = async (client, pollCache, event, phone) => {
 		optionId,
 		phone,
 		selected: event.delta.type === "voted",
-		senderAddress
+		sender
 	});
 	return message ? [message] : [];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/imessage",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "iMessage provider for spectrum-ts — local and remote (advanced) modes.",
   "repository": {
     "type": "git",