update events and fix ts5.6 bugs

evex-dev · Oct 10, 2024 · 3889369 · 3889369
1 parent bdc00c9
commit 3889369
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/packages/linejs/client/clients/base-client.ts b/packages/linejs/client/clients/base-client.ts
@@ -260,7 +260,7 @@ export class BaseClient extends TypedEventEmitter<ClientEvents> {
 				for (const event of myEvents.events) {
 					this.emit("square:event", event);
 
-					if (event.type === LINETypes.SquareEventType.NOTIFICATION_MESSAGE) {
+					if (event.type === LINETypes.SquareEventType._NOTIFICATION_MESSAGE) {
 						const payload = event.payload.notificationMessage;
 
 						if (!payload) {
@@ -395,6 +395,17 @@ export class BaseClient extends TypedEventEmitter<ClientEvents> {
 									await this.getMessageObsData(message.id, preview)),
 							message,
 						});
+					}else if (event.type === LINETypes.SquareEventType._NOTIFIED_UPDATE_SQUARE_CHAT_STATUS) {
+						const payload = event.payload.notifiedUpdateSquareChatStatus;
+
+						if (!payload) {
+							continue;
+						}
+
+						this.emit("square:status", {
+							...payload,
+							...payload["statusWithoutMessage"],
+						});
 					}
 				}
 				myEventsSyncToken = myEvents.syncToken;

diff --git a/packages/linejs/client/clients/internal/talk-client.ts b/packages/linejs/client/clients/internal/talk-client.ts
@@ -5,6 +5,7 @@ import type * as LINETypes from "@evex/linejs-types";
 import type { LooseType } from "../../entities/common.ts";
 import { ChannelClient } from "./channel-client.ts";
 import type { Buffer } from "node:buffer";
+import { InternalError } from "../../entities/errors.ts";
 
 export class TalkClient extends ChannelClient {
 	public useTalkCache: boolean = false;
@@ -149,7 +150,7 @@ export class TalkClient extends ChannelClient {
 				this.TalkService_API_PATH,
 			);
 		} catch (error) {
-			if ((error.data?.code as string).includes("E2EE") && !e2ee) {
+			if (error instanceof InternalError && (error.data?.code as string).includes("E2EE") && !e2ee) {
 				options.e2ee = true;
 				return await this.sendMessage(options);
 			} else {

diff --git a/packages/linejs/client/entities/events.ts b/packages/linejs/client/entities/events.ts
@@ -1,6 +1,7 @@
 import type { Log } from "./log.ts";
 import type * as LINETypes from "@evex/linejs-types";
 import type { Message, SquareMessage } from "./message.ts";
+import type { SquaerStatus } from "./square-events.ts";
 
 export type ClientEvents = {
 	pincall: (pincode: string) => void;
@@ -13,8 +14,8 @@ export type ClientEvents = {
 	"update:qrcert": (qrCert: string) => void;
 	log: (data: Log) => void;
 	"square:message": (squareMessage: SquareMessage) => void;
-	"square:member": (
-		squareMember: LINETypes.SquareEventNotificationMemberUpdate,
+	"square:status": (
+		squareStatus: SquaerStatus,
 	) => void;
 	"square:event": (squareEvent: LINETypes.SquareEvent) => void;
 	message: (message: Message) => void;

diff --git a/packages/linejs/client/entities/square-events.ts b/packages/linejs/client/entities/square-events.ts
@@ -0,0 +1,5 @@
+import type * as LINETypes from "@evex/linejs-types";
+
+export type SquaerStatus =
+    & LINETypes.SquareEventNotifiedUpdateSquareChatStatus
+    & LINETypes.SquareEventNotifiedUpdateSquareChatStatus["statusWithoutMessage"];