Comparing version 2.0.0-beta.1 to 2.0.0-beta.2
@@ -1,2 +0,2 @@ | ||
import { Message } from "../models/Message.js"; | ||
import { UserMessage } from "../models/Message.js"; | ||
import { Reactions } from "../models/Reaction.js"; | ||
@@ -6,2 +6,2 @@ export type AddReactionResponse = { | ||
}; | ||
export declare const addReactionFactory: (ctx: import("../context.js").ContextBase, api: import("../zalo.js").API) => (icon: Reactions, message: Message) => Promise<AddReactionResponse>; | ||
export declare const addReactionFactory: (ctx: import("../context.js").ContextBase, api: import("../zalo.js").API) => (icon: Reactions, message: UserMessage) => Promise<AddReactionResponse>; |
@@ -1,5 +0,5 @@ | ||
import { GroupMessage, Message } from "../models/index.js"; | ||
import { GroupMessage, UserMessage } from "../models/index.js"; | ||
export type DeleteMessageResponse = { | ||
status: number; | ||
}; | ||
export declare const deleteMessageFactory: (ctx: import("../context.js").ContextBase, api: import("../zalo.js").API) => (message: Message | GroupMessage, onlyMe?: boolean) => Promise<DeleteMessageResponse>; | ||
export declare const deleteMessageFactory: (ctx: import("../context.js").ContextBase, api: import("../zalo.js").API) => (message: UserMessage | GroupMessage, onlyMe?: boolean) => Promise<DeleteMessageResponse>; |
import { ZaloApiError } from "../Errors/ZaloApiError.js"; | ||
import { GroupMessage, Message, ThreadType } from "../models/index.js"; | ||
import { GroupMessage, UserMessage, ThreadType } from "../models/index.js"; | ||
import { apiFactory, removeUndefinedKeys } from "../utils.js"; | ||
@@ -19,3 +19,3 @@ export const deleteMessageFactory = apiFactory()((api, ctx, utils) => { | ||
var _a; | ||
if (!(message instanceof Message) && !(message instanceof GroupMessage)) | ||
if (!(message instanceof UserMessage) && !(message instanceof GroupMessage)) | ||
throw new ZaloApiError("Expected Message or GroupMessage instance, got: " + ((_a = message === null || message === void 0 ? void 0 : message.constructor) === null || _a === void 0 ? void 0 : _a.name)); | ||
@@ -25,3 +25,3 @@ if (message.isSelf && onlyMe === false) | ||
const params = { | ||
toid: message instanceof Message ? message.threadId : undefined, | ||
toid: message instanceof UserMessage ? message.threadId : undefined, | ||
grid: message instanceof GroupMessage ? message.threadId : undefined, | ||
@@ -38,3 +38,3 @@ cliMsgId: Date.now(), | ||
onlyMe: onlyMe ? 1 : 0, | ||
imei: message instanceof Message ? ctx.imei : undefined, | ||
imei: message instanceof UserMessage ? ctx.imei : undefined, | ||
}; | ||
@@ -41,0 +41,0 @@ removeUndefinedKeys(params); |
import EventEmitter from "events"; | ||
import { type GroupEvent } from "../models/GroupEvent.js"; | ||
import { GroupMessage, Message, Reaction, Undo } from "../models/index.js"; | ||
import { Message, Reaction, Undo } from "../models/index.js"; | ||
import type { ContextSession } from "../context.js"; | ||
type MessageEventData = Message | GroupMessage; | ||
type UploadEventData = { | ||
@@ -10,3 +9,3 @@ fileUrl: string; | ||
}; | ||
export type OnMessageCallback = (message: MessageEventData) => void | Promise<void>; | ||
export type OnMessageCallback = (message: Message) => any; | ||
export declare enum CloseReason { | ||
@@ -20,3 +19,3 @@ DuplicateConnection = 0, | ||
error: [error: any]; | ||
message: [message: MessageEventData]; | ||
message: [message: Message]; | ||
reaction: [reaction: Reaction]; | ||
@@ -23,0 +22,0 @@ upload_attachment: [data: UploadEventData]; |
import EventEmitter from "events"; | ||
import WebSocket from "ws"; | ||
import { initializeGroupEvent } from "../models/GroupEvent.js"; | ||
import { GroupMessage, Message, Reaction, Undo } from "../models/index.js"; | ||
import { GroupMessage, UserMessage, Reaction, Undo } from "../models/index.js"; | ||
import { decodeEventData, getGroupEventType, logger } from "../utils.js"; | ||
@@ -124,3 +124,3 @@ import { ZaloApiError } from "../Errors/ZaloApiError.js"; | ||
else { | ||
const messageObject = new Message(this.ctx.uid, msg); | ||
const messageObject = new UserMessage(this.ctx.uid, msg); | ||
if (messageObject.isSelf && !this.selfListen) | ||
@@ -127,0 +127,0 @@ continue; |
@@ -6,3 +6,3 @@ import { SerializedCookieJar } from "tough-cookie"; | ||
qrPath?: string; | ||
}, callback?: (qrPath: string) => void): Promise<{ | ||
}, callback?: (qrPath: string) => any): Promise<{ | ||
userInfo: { | ||
@@ -9,0 +9,0 @@ name: string; |
@@ -1,2 +0,2 @@ | ||
import { GroupMessage, Message, ThreadType } from "../models/index.js"; | ||
import { GroupMessage, UserMessage, ThreadType } from "../models/index.js"; | ||
export type SendMessageResult = { | ||
@@ -31,3 +31,3 @@ msgId: number; | ||
*/ | ||
quote?: Message | GroupMessage; | ||
quote?: UserMessage | GroupMessage; | ||
/** | ||
@@ -34,0 +34,0 @@ * Mentions in the message (optional) |
import FormData from "form-data"; | ||
import fs from "node:fs/promises"; | ||
import { ZaloApiError } from "../Errors/ZaloApiError.js"; | ||
import { GroupMessage, Message, ThreadType } from "../models/index.js"; | ||
import { GroupMessage, UserMessage, ThreadType } from "../models/index.js"; | ||
import { apiFactory, getClientMessageType, getFileExtension, getFileName, getGifMetaData, getMd5LargeFileObject, removeUndefinedKeys, resolveResponse, } from "../utils.js"; | ||
@@ -125,3 +125,3 @@ const attachmentUrlType = { | ||
throw new ZaloApiError("Missing message content"); | ||
const isValidInstance = quote instanceof Message || quote instanceof GroupMessage; | ||
const isValidInstance = quote instanceof UserMessage || quote instanceof GroupMessage; | ||
if (quote && !isValidInstance) | ||
@@ -128,0 +128,0 @@ throw new ZaloApiError("Invalid quote message"); |
@@ -1,5 +0,5 @@ | ||
import { GroupMessage, Message } from "../models/index.js"; | ||
import { GroupMessage, UserMessage } from "../models/index.js"; | ||
export type UndoResponse = { | ||
status: number; | ||
}; | ||
export declare const undoFactory: (ctx: import("../context.js").ContextBase, api: import("../zalo.js").API) => (message: Message | GroupMessage) => Promise<UndoResponse>; | ||
export declare const undoFactory: (ctx: import("../context.js").ContextBase, api: import("../zalo.js").API) => (message: UserMessage | GroupMessage) => Promise<UndoResponse>; |
import { ZaloApiError } from "../Errors/ZaloApiError.js"; | ||
import { GroupMessage, Message, ThreadType } from "../models/index.js"; | ||
import { GroupMessage, UserMessage, ThreadType } from "../models/index.js"; | ||
import { apiFactory } from "../utils.js"; | ||
@@ -18,3 +18,3 @@ export const undoFactory = apiFactory()((api, ctx, utils) => { | ||
var _a; | ||
if (!(message instanceof Message) && !(message instanceof GroupMessage)) | ||
if (!(message instanceof UserMessage) && !(message instanceof GroupMessage)) | ||
throw new ZaloApiError("Expected Message or GroupMessage instance, got: " + ((_a = message === null || message === void 0 ? void 0 : message.constructor) === null || _a === void 0 ? void 0 : _a.name)); | ||
@@ -21,0 +21,0 @@ if (!message.data.quote) |
@@ -71,4 +71,4 @@ import { ThreadType } from "./Enum.js"; | ||
}; | ||
export declare class Message { | ||
type: ThreadType; | ||
export declare class UserMessage { | ||
type: ThreadType.User; | ||
data: TMessage; | ||
@@ -83,3 +83,3 @@ threadId: string; | ||
export declare class GroupMessage { | ||
type: ThreadType; | ||
type: ThreadType.Group; | ||
data: TGroupMessage; | ||
@@ -93,1 +93,2 @@ threadId: string; | ||
} | ||
export type Message = UserMessage | GroupMessage; |
import { ThreadType } from "./Enum.js"; | ||
export class Message { | ||
export class UserMessage { | ||
constructor(uid, data) { | ||
@@ -4,0 +4,0 @@ this.type = ThreadType.User; |
import { compare } from "semver"; | ||
import { isBun, logger } from "./utils.js"; | ||
const VERSION = "2.0.0-beta.1"; | ||
const VERSION = "2.0.0-beta.2"; | ||
const NPM_REGISTRY = "https://registry.npmjs.org/zca-js"; | ||
@@ -5,0 +5,0 @@ export async function checkUpdate(ctx) { |
@@ -79,3 +79,3 @@ import { Listener } from "./apis/listen.js"; | ||
qrPath?: string; | ||
}, callback?: (qrPath: string) => void): Promise<API>; | ||
}, callback?: (qrPath: string) => any): Promise<API>; | ||
} | ||
@@ -82,0 +82,0 @@ export declare class API { |
{ | ||
"name": "zca-js", | ||
"version": "2.0.0-beta.1", | ||
"version": "2.0.0-beta.2", | ||
"description": "Unofficial Zalo API for JavaScript", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
416231