npm - @effect-ak/tg-bot-client - Versions diffs - 0.3.1 → 0.3.2 - Mend

@effect-ak/tg-bot-client 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
-import * as Context from 'effect/Context';
-import * as Micro from 'effect/Micro';
 import * as effect_Cause from 'effect/Cause';
 import * as effect_Types from 'effect/Types';
+import * as Micro from 'effect/Micro';
+import * as Context from 'effect/Context';
 type ErrorReason = {
     readonly type: "NotOkResponse";
@@ -31,11 +31,6 @@ type TgBotClientSettingsInput = {
     base_url?: string;
 };
-type TgBotClientConfigObject = Required<TgBotClientSettingsInput>;
-declare const TgBotClientConfig_base: Context.TagClass<TgBotClientConfig, "TgBotClientConfig", Required<TgBotClientSettingsInput>>;
-declare class TgBotClientConfig extends TgBotClientConfig_base {
-}
 interface AffiliateInfo {
     commission_per_mille: number;
     amount: number;
@@ -2730,38 +2725,19 @@ interface UploadStickerFileInput {
     sticker_format: "static" | "animated" | "video";
 }
-type ClientExecuteRequestServiceInterface = Micro.Micro.Success<typeof ClientExecuteRequestServiceDefault>;
-declare const ClientExecuteRequestServiceDefault: Micro.Micro<{
-    readonly execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Micro.Micro<ReturnType<Api[M]>, TgBotClientError, never>;
-}, never, TgBotClientConfig>;
-declare const getFile: (fileId: string, config: TgBotClientConfigObject, execute: ClientExecuteRequestServiceInterface) => Micro.Micro<File, TgBotClientError>;
-type ClientFileServiceInterface = Context.Tag.Service<typeof ClientFileService>;
-declare const ClientFileService_base: Context.TagClass<ClientFileService, "ClientFileService", {
-    getFile: (input: {
-        file_id: string;
-    }) => ReturnType<typeof getFile>;
-}>;
-declare class ClientFileService extends ClientFileService_base {
+declare const TgBotClientConfig_base: Context.TagClass<TgBotClientConfig, "TgBotClientConfig", Required<TgBotClientSettingsInput>>;
+declare class TgBotClientConfig extends TgBotClientConfig_base {
 }
-type TgBotClient = ReturnType<typeof makeTgBotClient>;
-declare const makeTgBotClient: (input: TgBotClientSettingsInput) => {
-    execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
-    getFile: (input: Parameters<ClientFileServiceInterface["getFile"]>[0]) => Promise<File>;
-};
 type PollAndHandleInput = {
     settings: BotMessageHandlerSettings;
-    execute: ClientExecuteRequestServiceInterface["execute"];
 };
 type PollAndHandleResult = Micro.Micro.Success<ReturnType<typeof pollAndHandle>>;
 declare const pollAndHandle: (input: PollAndHandleInput) => Micro.Micro<{
     updates: Update[];
     lastSuccessId: number | undefined;
     hasError: boolean;
-}, TgBotClientError, never>;
+}, TgBotClientError, TgBotClientConfig>;
 type AvailableUpdateTypes = Exclude<keyof Update, 'update_id'>;
 type LogLevel = "info" | "debug";
@@ -2783,20 +2759,28 @@ type BotMessageHandlerSettings = {
     onExit?: (_: Micro.MicroExit<PollAndHandleResult, TgBotClientError>) => void;
 };
+type BotUpdatePollerServiceInterface = Micro.Micro.Success<typeof BotUpdatesPollerServiceDefault>;
 declare const BotUpdatePollerService_base: Context.TagClass<BotUpdatePollerService, "BotUpdatePollerService", {
-    readonly runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, never>;
+    readonly runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
 }>;
 declare class BotUpdatePollerService extends BotUpdatePollerService_base {
 }
+declare const BotUpdatesPollerServiceDefault: Micro.Micro<{
+    readonly runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
+}, never, never>;
 type BotInstance = Micro.Micro.Success<ReturnType<typeof BotFactoryServiceDefault["runBot"]>>;
 declare const BotFactoryService_base: Context.TagClass<BotFactoryService, "BotFactoryService", {
     makeBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<{
-        fiber: Micro.MicroFiber<unknown, TgBotClientError>;
-        runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, never>;
-    }, never, BotUpdatePollerService>;
+        runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
+        interrupt: Micro.Micro<void, never, never>;
+    }, never, TgBotClientConfig | BotUpdatePollerService>;
     runBot: (input: RunBotInput) => Micro.Micro<{
-        readonly reload: (input: Partial<RunBotInput>) => Promise<Micro.MicroFiber<unknown, TgBotClientError>>;
+        readonly reload: (input: Partial<RunBotInput>) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, never>;
+        readonly bot: {
+            runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
+            interrupt: Micro.Micro<void, never, never>;
+        };
     }, string, never>;
 }>;
 declare class BotFactoryService extends BotFactoryService_base {
@@ -2808,17 +2792,42 @@ type RunBotInput = ({
 } & TgBotClientSettingsInput) & BotMessageHandlerSettings;
 declare const BotFactoryServiceDefault: {
     makeBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<{
-        fiber: Micro.MicroFiber<unknown, TgBotClientError>;
-        runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, never>;
-    }, never, BotUpdatePollerService>;
+        runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
+        interrupt: Micro.Micro<void, never, never>;
+    }, never, TgBotClientConfig | BotUpdatePollerService>;
     runBot: (input: RunBotInput) => Micro.Micro<{
-        readonly reload: (input: Partial<RunBotInput>) => Promise<Micro.MicroFiber<unknown, TgBotClientError>>;
+        readonly reload: (input: Partial<RunBotInput>) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, never>;
+        readonly bot: {
+            runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
+            interrupt: Micro.Micro<void, never, never>;
+        };
     }, string, never>;
 };
-declare const runTgChatBot: (input: Parameters<typeof BotFactoryServiceDefault.runBot>[0]) => Promise<{
-    readonly reload: (input: Partial<RunBotInput>) => Promise<Micro.MicroFiber<unknown, TgBotClientError>>;
+declare const runTgChatBot: (input: RunBotInput) => Promise<{
+    readonly reload: (input: Partial<RunBotInput>) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, never>;
+    readonly bot: {
+        runBot: (messageHandler: BotMessageHandlerSettings) => Micro.Micro<Micro.MicroFiber<unknown, TgBotClientError>, never, TgBotClientConfig>;
+        interrupt: Micro.Micro<void, never, never>;
+    };
+}>;
+declare const getFile: (fileId: string) => Micro.Micro<File, TgBotClientError, TgBotClientConfig>;
+type ClientFileServiceInterface = Context.Tag.Service<typeof ClientFileService>;
+declare const ClientFileService_base: Context.TagClass<ClientFileService, "ClientFileService", {
+    getFile: (input: {
+        file_id: string;
+    }) => ReturnType<typeof getFile>;
 }>;
+declare class ClientFileService extends ClientFileService_base {
+}
+type TgBotClient = ReturnType<typeof makeTgBotClient>;
+declare const makeTgBotClient: (input: TgBotClientSettingsInput) => {
+    execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
+    getFile: (input: Parameters<ClientFileServiceInterface["getFile"]>[0]) => Promise<File>;
+};
 declare const defaultBaseUrl = "https://api.telegram.org";
 declare const MESSAGE_EFFECTS: {
@@ -2833,4 +2842,4 @@ type MessageEffect = keyof typeof MESSAGE_EFFECTS;
 declare const messageEffectIdCodes: MessageEffect[];
 declare const isMessageEffect: (input: unknown) => input is MessageEffect;
-export { type AddStickerToSetInput, type AffiliateInfo, type Animation, type AnswerCallbackQueryInput, type AnswerInlineQueryInput, type AnswerPreCheckoutQueryInput, type AnswerShippingQueryInput, type AnswerWebAppQueryInput, type Api, type ApproveChatJoinRequestInput, type Audio, type AvailableUpdateTypes, type BackgroundFill, type BackgroundFillFreeformGradient, type BackgroundFillGradient, type BackgroundFillSolid, type BackgroundType, type BackgroundTypeChatTheme, type BackgroundTypeFill, type BackgroundTypePattern, type BackgroundTypeWallpaper, type BanChatMemberInput, type BanChatSenderChatInput, type Birthdate, type BotCommand, type BotCommandScope, type BotCommandScopeAllChatAdministrators, type BotCommandScopeAllGroupChats, type BotCommandScopeAllPrivateChats, type BotCommandScopeChat, type BotCommandScopeChatAdministrators, type BotCommandScopeChatMember, type BotCommandScopeDefault, type BotDescription, BotFactoryService, BotFactoryServiceDefault, type BotInstance, type BotMessageHandlerSettings, type BotMessageHandlers, type BotName, type BotResponse, type BotShortDescription, type BusinessConnection, type BusinessIntro, type BusinessLocation, type BusinessMessagesDeleted, type BusinessOpeningHours, type BusinessOpeningHoursInterval, type CallbackGame, type CallbackQuery, type Chat, type ChatAdministratorRights, type ChatBackground, type ChatBoost, type ChatBoostAdded, type ChatBoostRemoved, type ChatBoostSource, type ChatBoostSourceGiftCode, type ChatBoostSourceGiveaway, type ChatBoostSourcePremium, type ChatBoostUpdated, type ChatFullInfo, type ChatInviteLink, type ChatJoinRequest, type ChatLocation, type ChatMember, type ChatMemberAdministrator, type ChatMemberBanned, type ChatMemberLeft, type ChatMemberMember, type ChatMemberOwner, type ChatMemberRestricted, type ChatMemberUpdated, type ChatPermissions, type ChatPhoto, type ChatShared, type ChosenInlineResult, type CloseForumTopicInput, type CloseGeneralForumTopicInput, type CloseInput, type Contact, type CopyMessageInput, type CopyMessagesInput, type CopyTextButton, type CreateChatInviteLinkInput, type CreateChatSubscriptionInviteLinkInput, type CreateForumTopicInput, type CreateInvoiceLinkInput, type CreateNewStickerSetInput, type DeclineChatJoinRequestInput, type DeleteChatPhotoInput, type DeleteChatStickerSetInput, type DeleteForumTopicInput, type DeleteMessageInput, type DeleteMessagesInput, type DeleteMyCommandsInput, type DeleteStickerFromSetInput, type DeleteStickerSetInput, type DeleteWebhookInput, type Dice, type Document, type EditChatInviteLinkInput, type EditChatSubscriptionInviteLinkInput, type EditForumTopicInput, type EditGeneralForumTopicInput, type EditMessageCaptionInput, type EditMessageLiveLocationInput, type EditMessageMediaInput, type EditMessageReplyMarkupInput, type EditMessageTextInput, type EditUserStarSubscriptionInput, type EncryptedCredentials, type EncryptedPassportElement, type ExportChatInviteLinkInput, type ExternalReplyInfo, type File$1 as File, type ForceReply, type ForumTopic, type ForumTopicClosed, type ForumTopicCreated, type ForumTopicEdited, type ForumTopicReopened, type ForwardMessageInput, type ForwardMessagesInput, type Game, type GameHighScore, type GeneralForumTopicHidden, type GeneralForumTopicUnhidden, type GetAvailableGiftsInput, type GetBusinessConnectionInput, type GetChatAdministratorsInput, type GetChatInput, type GetChatMemberCountInput, type GetChatMemberInput, type GetChatMenuButtonInput, type GetCustomEmojiStickersInput, type GetFileInput, type GetForumTopicIconStickersInput, type GetGameHighScoresInput, type GetMeInput, type GetMyCommandsInput, type GetMyDefaultAdministratorRightsInput, type GetMyDescriptionInput, type GetMyNameInput, type GetMyShortDescriptionInput, type GetStarTransactionsInput, type GetStickerSetInput, type GetUpdatesInput, type GetUserChatBoostsInput, type GetUserProfilePhotosInput, type GetWebhookInfoInput, type Gift, type Gifts, type Giveaway, type GiveawayCompleted, type GiveawayCreated, type GiveawayWinners, type HideGeneralForumTopicInput, type InaccessibleMessage, type InlineKeyboardButton, type InlineKeyboardMarkup, type InlineQuery, type InlineQueryResult, type InlineQueryResultArticle, type InlineQueryResultAudio, type InlineQueryResultCachedAudio, type InlineQueryResultCachedDocument, type InlineQueryResultCachedGif, type InlineQueryResultCachedMpeg4Gif, type InlineQueryResultCachedPhoto, type InlineQueryResultCachedSticker, type InlineQueryResultCachedVideo, type InlineQueryResultCachedVoice, type InlineQueryResultContact, type InlineQueryResultDocument, type InlineQueryResultGame, type InlineQueryResultGif, type InlineQueryResultLocation, type InlineQueryResultMpeg4Gif, type InlineQueryResultPhoto, type InlineQueryResultVenue, type InlineQueryResultVideo, type InlineQueryResultVoice, type InlineQueryResultsButton, type InputContactMessageContent, type InputFile, type InputInvoiceMessageContent, type InputLocationMessageContent, type InputMedia, type InputMediaAnimation, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type InputMessageContent, type InputPaidMedia, type InputPaidMediaPhoto, type InputPaidMediaVideo, type InputPollOption, type InputSticker, type InputTextMessageContent, type InputVenueMessageContent, type Invoice, type KeyboardButton, type KeyboardButtonPollType, type KeyboardButtonRequestChat, type KeyboardButtonRequestUsers, type LabeledPrice, type LeaveChatInput, type LinkPreviewOptions, type Location, type LogLevel, type LogOutInput, type LoginUrl, MESSAGE_EFFECTS, type MaskPosition, type MaybeInaccessibleMessage, type MenuButton, type MenuButtonCommands, type MenuButtonDefault, type MenuButtonWebApp, type Message, type MessageAutoDeleteTimerChanged, type MessageEffect, type MessageEntity, type MessageId, type MessageOrigin, type MessageOriginChannel, type MessageOriginChat, type MessageOriginHiddenUser, type MessageOriginUser, type MessageReactionCountUpdated, type MessageReactionUpdated, type OrderInfo, type PaidMedia, type PaidMediaInfo, type PaidMediaPhoto, type PaidMediaPreview, type PaidMediaPurchased, type PaidMediaVideo, type PassportData, type PassportElementError, type PassportElementErrorDataField, type PassportElementErrorFile, type PassportElementErrorFiles, type PassportElementErrorFrontSide, type PassportElementErrorReverseSide, type PassportElementErrorSelfie, type PassportElementErrorTranslationFile, type PassportElementErrorTranslationFiles, type PassportElementErrorUnspecified, type PassportFile, type PhotoSize, type PinChatMessageInput, type Poll, type PollAnswer, type PollOption, type PreCheckoutQuery, type PreparedInlineMessage, type PromoteChatMemberInput, type ProximityAlertTriggered, type ReactionCount, type ReactionType, type ReactionTypeCustomEmoji, type ReactionTypeEmoji, type ReactionTypePaid, type RefundStarPaymentInput, type RefundedPayment, type ReopenForumTopicInput, type ReopenGeneralForumTopicInput, type ReplaceStickerInSetInput, type ReplyKeyboardMarkup, type ReplyKeyboardRemove, type ReplyParameters, type ResponseParameters, type RestrictChatMemberInput, type RevenueWithdrawalState, type RevenueWithdrawalStateFailed, type RevenueWithdrawalStatePending, type RevenueWithdrawalStateSucceeded, type RevokeChatInviteLinkInput, type RunBotInput, type SavePreparedInlineMessageInput, type SendAnimationInput, type SendAudioInput, type SendChatActionInput, type SendContactInput, type SendDiceInput, type SendDocumentInput, type SendGameInput, type SendGiftInput, type SendInvoiceInput, type SendLocationInput, type SendMediaGroupInput, type SendMessageInput, type SendPaidMediaInput, type SendPhotoInput, type SendPollInput, type SendStickerInput, type SendVenueInput, type SendVideoInput, type SendVideoNoteInput, type SendVoiceInput, type SentWebAppMessage, type SetChatAdministratorCustomTitleInput, type SetChatDescriptionInput, type SetChatMenuButtonInput, type SetChatPermissionsInput, type SetChatPhotoInput, type SetChatStickerSetInput, type SetChatTitleInput, type SetCustomEmojiStickerSetThumbnailInput, type SetGameScoreInput, type SetMessageReactionInput, type SetMyCommandsInput, type SetMyDefaultAdministratorRightsInput, type SetMyDescriptionInput, type SetMyNameInput, type SetMyShortDescriptionInput, type SetPassportDataErrorsInput, type SetStickerEmojiListInput, type SetStickerKeywordsInput, type SetStickerMaskPositionInput, type SetStickerPositionInSetInput, type SetStickerSetThumbnailInput, type SetStickerSetTitleInput, type SetUserEmojiStatusInput, type SetWebhookInput, type SharedUser, type ShippingAddress, type ShippingOption, type ShippingQuery, type StarTransaction, type StarTransactions, type Sticker, type StickerSet, type StopMessageLiveLocationInput, type StopPollInput, type Story, type SuccessfulPayment, type SwitchInlineQueryChosenChat, type TextQuote, type TgBotClient, type TransactionPartner, type TransactionPartnerAffiliateProgram, type TransactionPartnerFragment, type TransactionPartnerOther, type TransactionPartnerTelegramAds, type TransactionPartnerTelegramApi, type TransactionPartnerUser, type UnbanChatMemberInput, type UnbanChatSenderChatInput, type UnhideGeneralForumTopicInput, type UnpinAllChatMessagesInput, type UnpinAllForumTopicMessagesInput, type UnpinAllGeneralForumTopicMessagesInput, type UnpinChatMessageInput, type Update, type UploadStickerFileInput, type User, type UserChatBoosts, type UserProfilePhotos, type UsersShared, type Venue, type Video, type VideoChatEnded, type VideoChatParticipantsInvited, type VideoChatScheduled, type VideoChatStarted, type VideoNote, type Voice, type WebAppData, type WebAppInfo, type WebhookInfo, type WriteAccessAllowed, defaultBaseUrl, isMessageEffect, makeTgBotClient, messageEffectIdCodes, runTgChatBot };
+export { type AddStickerToSetInput, type AffiliateInfo, type Animation, type AnswerCallbackQueryInput, type AnswerInlineQueryInput, type AnswerPreCheckoutQueryInput, type AnswerShippingQueryInput, type AnswerWebAppQueryInput, type Api, type ApproveChatJoinRequestInput, type Audio, type AvailableUpdateTypes, type BackgroundFill, type BackgroundFillFreeformGradient, type BackgroundFillGradient, type BackgroundFillSolid, type BackgroundType, type BackgroundTypeChatTheme, type BackgroundTypeFill, type BackgroundTypePattern, type BackgroundTypeWallpaper, type BanChatMemberInput, type BanChatSenderChatInput, type Birthdate, type BotCommand, type BotCommandScope, type BotCommandScopeAllChatAdministrators, type BotCommandScopeAllGroupChats, type BotCommandScopeAllPrivateChats, type BotCommandScopeChat, type BotCommandScopeChatAdministrators, type BotCommandScopeChatMember, type BotCommandScopeDefault, type BotDescription, BotFactoryService, BotFactoryServiceDefault, type BotInstance, type BotMessageHandlerSettings, type BotMessageHandlers, type BotName, type BotResponse, type BotShortDescription, BotUpdatePollerService, type BotUpdatePollerServiceInterface, BotUpdatesPollerServiceDefault, type BusinessConnection, type BusinessIntro, type BusinessLocation, type BusinessMessagesDeleted, type BusinessOpeningHours, type BusinessOpeningHoursInterval, type CallbackGame, type CallbackQuery, type Chat, type ChatAdministratorRights, type ChatBackground, type ChatBoost, type ChatBoostAdded, type ChatBoostRemoved, type ChatBoostSource, type ChatBoostSourceGiftCode, type ChatBoostSourceGiveaway, type ChatBoostSourcePremium, type ChatBoostUpdated, type ChatFullInfo, type ChatInviteLink, type ChatJoinRequest, type ChatLocation, type ChatMember, type ChatMemberAdministrator, type ChatMemberBanned, type ChatMemberLeft, type ChatMemberMember, type ChatMemberOwner, type ChatMemberRestricted, type ChatMemberUpdated, type ChatPermissions, type ChatPhoto, type ChatShared, type ChosenInlineResult, type CloseForumTopicInput, type CloseGeneralForumTopicInput, type CloseInput, type Contact, type CopyMessageInput, type CopyMessagesInput, type CopyTextButton, type CreateChatInviteLinkInput, type CreateChatSubscriptionInviteLinkInput, type CreateForumTopicInput, type CreateInvoiceLinkInput, type CreateNewStickerSetInput, type DeclineChatJoinRequestInput, type DeleteChatPhotoInput, type DeleteChatStickerSetInput, type DeleteForumTopicInput, type DeleteMessageInput, type DeleteMessagesInput, type DeleteMyCommandsInput, type DeleteStickerFromSetInput, type DeleteStickerSetInput, type DeleteWebhookInput, type Dice, type Document, type EditChatInviteLinkInput, type EditChatSubscriptionInviteLinkInput, type EditForumTopicInput, type EditGeneralForumTopicInput, type EditMessageCaptionInput, type EditMessageLiveLocationInput, type EditMessageMediaInput, type EditMessageReplyMarkupInput, type EditMessageTextInput, type EditUserStarSubscriptionInput, type EncryptedCredentials, type EncryptedPassportElement, type ExportChatInviteLinkInput, type ExternalReplyInfo, type File$1 as File, type ForceReply, type ForumTopic, type ForumTopicClosed, type ForumTopicCreated, type ForumTopicEdited, type ForumTopicReopened, type ForwardMessageInput, type ForwardMessagesInput, type Game, type GameHighScore, type GeneralForumTopicHidden, type GeneralForumTopicUnhidden, type GetAvailableGiftsInput, type GetBusinessConnectionInput, type GetChatAdministratorsInput, type GetChatInput, type GetChatMemberCountInput, type GetChatMemberInput, type GetChatMenuButtonInput, type GetCustomEmojiStickersInput, type GetFileInput, type GetForumTopicIconStickersInput, type GetGameHighScoresInput, type GetMeInput, type GetMyCommandsInput, type GetMyDefaultAdministratorRightsInput, type GetMyDescriptionInput, type GetMyNameInput, type GetMyShortDescriptionInput, type GetStarTransactionsInput, type GetStickerSetInput, type GetUpdatesInput, type GetUserChatBoostsInput, type GetUserProfilePhotosInput, type GetWebhookInfoInput, type Gift, type Gifts, type Giveaway, type GiveawayCompleted, type GiveawayCreated, type GiveawayWinners, type HideGeneralForumTopicInput, type InaccessibleMessage, type InlineKeyboardButton, type InlineKeyboardMarkup, type InlineQuery, type InlineQueryResult, type InlineQueryResultArticle, type InlineQueryResultAudio, type InlineQueryResultCachedAudio, type InlineQueryResultCachedDocument, type InlineQueryResultCachedGif, type InlineQueryResultCachedMpeg4Gif, type InlineQueryResultCachedPhoto, type InlineQueryResultCachedSticker, type InlineQueryResultCachedVideo, type InlineQueryResultCachedVoice, type InlineQueryResultContact, type InlineQueryResultDocument, type InlineQueryResultGame, type InlineQueryResultGif, type InlineQueryResultLocation, type InlineQueryResultMpeg4Gif, type InlineQueryResultPhoto, type InlineQueryResultVenue, type InlineQueryResultVideo, type InlineQueryResultVoice, type InlineQueryResultsButton, type InputContactMessageContent, type InputFile, type InputInvoiceMessageContent, type InputLocationMessageContent, type InputMedia, type InputMediaAnimation, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type InputMessageContent, type InputPaidMedia, type InputPaidMediaPhoto, type InputPaidMediaVideo, type InputPollOption, type InputSticker, type InputTextMessageContent, type InputVenueMessageContent, type Invoice, type KeyboardButton, type KeyboardButtonPollType, type KeyboardButtonRequestChat, type KeyboardButtonRequestUsers, type LabeledPrice, type LeaveChatInput, type LinkPreviewOptions, type Location, type LogLevel, type LogOutInput, type LoginUrl, MESSAGE_EFFECTS, type MaskPosition, type MaybeInaccessibleMessage, type MenuButton, type MenuButtonCommands, type MenuButtonDefault, type MenuButtonWebApp, type Message, type MessageAutoDeleteTimerChanged, type MessageEffect, type MessageEntity, type MessageId, type MessageOrigin, type MessageOriginChannel, type MessageOriginChat, type MessageOriginHiddenUser, type MessageOriginUser, type MessageReactionCountUpdated, type MessageReactionUpdated, type OrderInfo, type PaidMedia, type PaidMediaInfo, type PaidMediaPhoto, type PaidMediaPreview, type PaidMediaPurchased, type PaidMediaVideo, type PassportData, type PassportElementError, type PassportElementErrorDataField, type PassportElementErrorFile, type PassportElementErrorFiles, type PassportElementErrorFrontSide, type PassportElementErrorReverseSide, type PassportElementErrorSelfie, type PassportElementErrorTranslationFile, type PassportElementErrorTranslationFiles, type PassportElementErrorUnspecified, type PassportFile, type PhotoSize, type PinChatMessageInput, type Poll, type PollAnswer, type PollOption, type PreCheckoutQuery, type PreparedInlineMessage, type PromoteChatMemberInput, type ProximityAlertTriggered, type ReactionCount, type ReactionType, type ReactionTypeCustomEmoji, type ReactionTypeEmoji, type ReactionTypePaid, type RefundStarPaymentInput, type RefundedPayment, type ReopenForumTopicInput, type ReopenGeneralForumTopicInput, type ReplaceStickerInSetInput, type ReplyKeyboardMarkup, type ReplyKeyboardRemove, type ReplyParameters, type ResponseParameters, type RestrictChatMemberInput, type RevenueWithdrawalState, type RevenueWithdrawalStateFailed, type RevenueWithdrawalStatePending, type RevenueWithdrawalStateSucceeded, type RevokeChatInviteLinkInput, type RunBotInput, type SavePreparedInlineMessageInput, type SendAnimationInput, type SendAudioInput, type SendChatActionInput, type SendContactInput, type SendDiceInput, type SendDocumentInput, type SendGameInput, type SendGiftInput, type SendInvoiceInput, type SendLocationInput, type SendMediaGroupInput, type SendMessageInput, type SendPaidMediaInput, type SendPhotoInput, type SendPollInput, type SendStickerInput, type SendVenueInput, type SendVideoInput, type SendVideoNoteInput, type SendVoiceInput, type SentWebAppMessage, type SetChatAdministratorCustomTitleInput, type SetChatDescriptionInput, type SetChatMenuButtonInput, type SetChatPermissionsInput, type SetChatPhotoInput, type SetChatStickerSetInput, type SetChatTitleInput, type SetCustomEmojiStickerSetThumbnailInput, type SetGameScoreInput, type SetMessageReactionInput, type SetMyCommandsInput, type SetMyDefaultAdministratorRightsInput, type SetMyDescriptionInput, type SetMyNameInput, type SetMyShortDescriptionInput, type SetPassportDataErrorsInput, type SetStickerEmojiListInput, type SetStickerKeywordsInput, type SetStickerMaskPositionInput, type SetStickerPositionInSetInput, type SetStickerSetThumbnailInput, type SetStickerSetTitleInput, type SetUserEmojiStatusInput, type SetWebhookInput, type SharedUser, type ShippingAddress, type ShippingOption, type ShippingQuery, type StarTransaction, type StarTransactions, type Sticker, type StickerSet, type StopMessageLiveLocationInput, type StopPollInput, type Story, type SuccessfulPayment, type SwitchInlineQueryChosenChat, type TextQuote, type TgBotClient, type TransactionPartner, type TransactionPartnerAffiliateProgram, type TransactionPartnerFragment, type TransactionPartnerOther, type TransactionPartnerTelegramAds, type TransactionPartnerTelegramApi, type TransactionPartnerUser, type UnbanChatMemberInput, type UnbanChatSenderChatInput, type UnhideGeneralForumTopicInput, type UnpinAllChatMessagesInput, type UnpinAllForumTopicMessagesInput, type UnpinAllGeneralForumTopicMessagesInput, type UnpinChatMessageInput, type Update, type UploadStickerFileInput, type User, type UserChatBoosts, type UserProfilePhotos, type UsersShared, type Venue, type Video, type VideoChatEnded, type VideoChatParticipantsInvited, type VideoChatScheduled, type VideoChatStarted, type VideoNote, type Voice, type WebAppData, type WebAppInfo, type WebhookInfo, type WriteAccessAllowed, defaultBaseUrl, isMessageEffect, makeTgBotClient, messageEffectIdCodes, runTgChatBot };

package/dist/index.js CHANGED Viewed

@@ -32,6 +32,8 @@ var src_exports = {};
 __export(src_exports, {
   BotFactoryService: () => BotFactoryService,
   BotFactoryServiceDefault: () => BotFactoryServiceDefault,
+  BotUpdatePollerService: () => BotUpdatePollerService,
+  BotUpdatesPollerServiceDefault: () => BotUpdatesPollerServiceDefault,
   MESSAGE_EFFECTS: () => MESSAGE_EFFECTS,
   defaultBaseUrl: () => defaultBaseUrl,
   isMessageEffect: () => isMessageEffect,
@@ -41,8 +43,87 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
-// src/client/_client.ts
-var Micro5 = __toESM(require("effect/Micro"));
+// src/bot/factory/_service.ts
+var Micro7 = __toESM(require("effect/Micro"));
+var Context3 = __toESM(require("effect/Context"));
+// src/bot/update-poller/_service.ts
+var Micro4 = __toESM(require("effect/Micro"));
+var Context2 = __toESM(require("effect/Context"));
+// src/bot/update-poller/poll-and-handle.ts
+var Micro3 = __toESM(require("effect/Micro"));
+// src/bot/update-poller/settings.ts
+var makeSettingsFrom = (input) => {
+  let limit = input.batch_size ?? 10;
+  let timeout = input.timeout ?? 10;
+  let max_empty_responses = input.max_empty_responses;
+  let update_types = input.update_types;
+  let log_level = input.log_level;
+  if (limit < 10 || limit > 100) {
+    console.warn("Wrong limit, must be in [10..100], using 10 instead");
+    limit = 10;
+  }
+  if (timeout < 2 || timeout > 10) {
+    console.warn("Wrong timeout, must be in [2..10], using 2 instead");
+    limit = 10;
+  }
+  if (max_empty_responses && max_empty_responses < 2) {
+    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
+    max_empty_responses = void 0;
+  }
+  if (max_empty_responses && max_empty_responses < 2) {
+    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
+    max_empty_responses = void 0;
+  }
+  if (!update_types) {
+    console.info("Handling only messages, ignoring others");
+    update_types = ["message"];
+  }
+  if (!log_level) {
+    log_level = "info";
+  }
+  return {
+    limit,
+    timeout,
+    max_empty_responses,
+    update_types,
+    log_level
+  };
+};
+// src/bot/update-poller/fetch-updates.ts
+var Micro2 = __toESM(require("effect/Micro"));
+// src/bot/message-handler/utils.ts
+var extractUpdate = (input) => {
+  for (const [field, value] of Object.entries(input)) {
+    if (field == "update_id") {
+      continue;
+    }
+    return {
+      type: field,
+      ...value
+    };
+  }
+  return;
+};
+// src/client/execute-request/execute.ts
+var Micro = __toESM(require("effect/Micro"));
+var String = __toESM(require("effect/String"));
+// src/client/errors.ts
+var Data = __toESM(require("effect/Data"));
+var TgBotClientError = class _TgBotClientError extends Data.TaggedError("TgBotClientError") {
+  static missingSuccess = new _TgBotClientError({
+    reason: {
+      type: "ClientInternalError",
+      cause: "Expected 'success' to be defined"
+    }
+  });
+};
 // src/client/config.ts
 var Context = __toESM(require("effect/Context"));
@@ -70,25 +151,6 @@ var makeTgBotClientConfig = (input) => TgBotClientConfig.of({
 var TgBotClientConfig = class extends Context.Tag("TgBotClientConfig")() {
 };
-// src/client/execute-request/_service.ts
-var Micro2 = __toESM(require("effect/Micro"));
-var Context2 = __toESM(require("effect/Context"));
-// src/client/execute-request/execute.ts
-var Micro = __toESM(require("effect/Micro"));
-var String = __toESM(require("effect/String"));
-// src/client/errors.ts
-var Data = __toESM(require("effect/Data"));
-var TgBotClientError = class _TgBotClientError extends Data.TaggedError("TgBotClientError") {
-  static missingSuccess = new _TgBotClientError({
-    reason: {
-      type: "ClientInternalError",
-      cause: "Expected 'success' to be defined"
-    }
-  });
-};
 // src/client/guards.ts
 var isFileContent = (input) => typeof input == "object" && input != null && ("file_content" in input && input.file_content instanceof Uint8Array) && ("file_name" in input && typeof input.file_name == "string");
 var isTgBotApiResponse = (input) => typeof input == "object" && input != null && ("ok" in input && typeof input.ok == "boolean");
@@ -113,7 +175,8 @@ var makePayload = (body) => {
 };
 // src/client/execute-request/execute.ts
-var execute = (config, method, input) => Micro.gen(function* () {
+var execute = (method, input) => Micro.gen(function* () {
+  const config = yield* Micro.service(TgBotClientConfig);
   const httpResponse = yield* Micro.tryPromise({
     try: () => fetch(
       `${config.base_url}/bot${config.bot_token}/${String.snakeToCamel(method)}`,
@@ -149,160 +212,17 @@ var execute = (config, method, input) => Micro.gen(function* () {
   return response.result;
 });
-// src/client/execute-request/_service.ts
-var ClientExecuteRequestService = class extends Context2.Tag("ClientExecuteRequestService")() {
-};
-var ClientExecuteRequestServiceDefault = Micro2.gen(function* () {
-  const config = yield* Micro2.service(TgBotClientConfig);
-  return {
-    execute: (method, input) => execute(config, method, input)
-  };
-});
-// src/client/file/_service.ts
-var Micro4 = __toESM(require("effect/Micro"));
-var Context3 = __toESM(require("effect/Context"));
-// src/client/file/get-file.ts
-var Micro3 = __toESM(require("effect/Micro"));
-var getFile = (fileId, config, execute2) => Micro3.gen(function* () {
-  const response = yield* execute2.execute("get_file", { file_id: fileId });
-  const file_path = response.file_path;
-  if (!file_path || file_path.length == 0) {
-    return yield* Micro3.fail(
-      new TgBotClientError({
-        reason: {
-          type: "UnableToGetFile",
-          cause: "File path not defined"
-        }
-      })
-    );
-  }
-  const file_name = file_path.replaceAll("/", "-");
-  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`;
-  const fileContent = yield* Micro3.tryPromise({
-    try: () => fetch(url).then((_) => _.arrayBuffer()),
-    catch: (cause) => new TgBotClientError({
-      reason: { type: "UnableToGetFile", cause }
-    })
-  });
-  const file = new File([new Uint8Array(fileContent)], file_name);
-  return file;
-});
-// src/client/file/_service.ts
-var ClientFileService = class extends Context3.Tag("ClientFileService")() {
-};
-var ClientFileServiceDefault = Micro4.gen(function* () {
-  const config = yield* Micro4.service(TgBotClientConfig);
-  const execute2 = yield* Micro4.service(ClientExecuteRequestService);
-  return {
-    getFile: (input) => getFile(input.file_id, config, execute2)
-  };
-}).pipe(
-  Micro4.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault)
-);
-// src/client/_client.ts
-var makeTgBotClient = (input) => {
-  const config = makeTgBotClientConfig(input);
-  const client = Micro5.gen(function* () {
-    const execute2 = yield* Micro5.service(ClientExecuteRequestService);
-    const file = yield* Micro5.service(ClientFileService);
-    return {
-      execute: (method, input2) => execute2.execute(method, input2).pipe(Micro5.runPromise),
-      getFile: (input2) => file.getFile(input2).pipe(Micro5.runPromise)
-    };
-  }).pipe(
-    Micro5.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault),
-    Micro5.provideServiceEffect(ClientFileService, ClientFileServiceDefault),
-    Micro5.provideService(TgBotClientConfig, config),
-    Micro5.runSync
-  );
-  return client;
-};
-// src/bot/run.ts
-var Micro12 = __toESM(require("effect/Micro"));
-// src/bot/factory/_service.ts
-var Micro11 = __toESM(require("effect/Micro"));
-var Context5 = __toESM(require("effect/Context"));
-// src/bot/update-poller/_service.ts
-var Micro8 = __toESM(require("effect/Micro"));
-var Context4 = __toESM(require("effect/Context"));
-// src/bot/update-poller/poll-and-handle.ts
-var Micro7 = __toESM(require("effect/Micro"));
-// src/bot/update-poller/settings.ts
-var makeSettingsFrom = (input) => {
-  let limit = input.batch_size ?? 10;
-  let timeout = input.timeout ?? 10;
-  let max_empty_responses = input.max_empty_responses;
-  let update_types = input.update_types;
-  let log_level = input.log_level;
-  if (limit < 10 || limit > 100) {
-    console.warn("Wrong limit, must be in [10..100], using 10 instead");
-    limit = 10;
-  }
-  if (timeout < 2 || timeout > 10) {
-    console.warn("Wrong timeout, must be in [2..10], using 2 instead");
-    limit = 10;
-  }
-  if (max_empty_responses && max_empty_responses < 2) {
-    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
-    max_empty_responses = void 0;
-  }
-  if (max_empty_responses && max_empty_responses < 2) {
-    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
-    max_empty_responses = void 0;
-  }
-  if (!update_types) {
-    console.info("Handling only messages, ignoring others");
-    update_types = ["message"];
-  }
-  if (!log_level) {
-    log_level = "info";
-  }
-  return {
-    limit,
-    timeout,
-    max_empty_responses,
-    update_types,
-    log_level
-  };
-};
 // src/bot/update-poller/fetch-updates.ts
-var Micro6 = __toESM(require("effect/Micro"));
-// src/bot/message-handler/utils.ts
-var extractUpdate = (input) => {
-  for (const [field, value] of Object.entries(input)) {
-    if (field == "update_id") {
-      continue;
-    }
-    return {
-      type: field,
-      ...value
-    };
-  }
-  return;
-};
-// src/bot/update-poller/fetch-updates.ts
-var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro6.gen(function* () {
+var fetchUpdates = ({ state, settings, handlers }) => Micro2.gen(function* () {
   const updateId = state.lastUpdateId;
   if (settings.log_level == "debug") {
     console.debug("getting updates", state);
   }
-  const updates = yield* execute2("get_updates", {
+  const updates = yield* execute("get_updates", {
     ...settings,
     ...updateId ? { offset: updateId } : void 0
   }).pipe(
-    Micro6.andThen((_) => _.sort((_2) => _2.update_id))
+    Micro2.andThen((_) => _.sort((_2) => _2.update_id))
   );
   let lastSuccessId = void 0;
   let hasError = false;
@@ -336,7 +256,7 @@ var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro6.
     }
     const handleResult = handler(update);
     if ("chat" in update && handleResult) {
-      const response = yield* execute2(`send_${handleResult.type}`, {
+      const response = yield* execute(`send_${handleResult.type}`, {
         ...handleResult,
         chat_id: update.chat.id
       });
@@ -351,7 +271,7 @@ var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro6.
     lastSuccessId = updateObject.update_id;
   }
   if (hasError && lastSuccessId) {
-    yield* execute2("get_updates", {
+    yield* execute("get_updates", {
       offset: lastSuccessId,
       limit: 0
     });
@@ -369,15 +289,14 @@ var pollAndHandle = (input) => {
     emptyResponses: 0
   };
   const settings = makeSettingsFrom(input.settings);
-  return Micro7.delay(1e3)(
+  return Micro3.delay(1e3)(
     fetchUpdates({
       state,
       settings,
-      execute: input.execute,
       handlers: input.settings
     })
   ).pipe(
-    Micro7.repeat({
+    Micro3.repeat({
       while: ({ updates, lastSuccessId, hasError }) => {
         if (hasError) {
           console.info("error in handler, quitting");
@@ -403,22 +322,19 @@ var pollAndHandle = (input) => {
 };
 // src/bot/update-poller/_service.ts
-var BotUpdatePollerService = class extends Context4.Tag("BotUpdatePollerService")() {
+var BotUpdatePollerService = class extends Context2.Tag("BotUpdatePollerService")() {
 };
-var BotUpdatesPollerServiceDefault = Micro8.gen(function* () {
+var BotUpdatesPollerServiceDefault = Micro4.gen(function* () {
   console.log("Initiating BotUpdatesPollerServiceDefault");
   const state = {
     fiber: void 0
   };
-  const client = yield* Micro8.service(ClientExecuteRequestService);
-  const runBot = (messageHandler) => Micro8.gen(function* () {
-    console.log(state);
+  const runBot = (messageHandler) => Micro4.gen(function* () {
     const startFiber = pollAndHandle({
-      settings: messageHandler,
-      execute: client.execute
+      settings: messageHandler
     }).pipe(
-      Micro8.forkDaemon,
-      Micro8.tap(
+      Micro4.forkDaemon,
+      Micro4.tap(
         (fiber) => fiber.addObserver((exit) => {
           console.log("bot's fiber has been closed", exit);
           if (messageHandler.onExit) {
@@ -429,83 +345,156 @@ var BotUpdatesPollerServiceDefault = Micro8.gen(function* () {
     );
     if (state.fiber) {
       console.log("killing previous bot's fiber");
-      yield* Micro8.fiberInterrupt(state.fiber);
+      yield* Micro4.fiberInterrupt(state.fiber);
     }
     state.fiber = yield* startFiber;
-    console.log("Reading bot's updates.....", state.fiber == null);
+    console.log("Fetching bot updates via long polling...");
     return state.fiber;
   });
   return {
     runBot
   };
-}).pipe(
-  Micro8.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault)
-);
+});
 // src/bot/factory/client-config.ts
-var Micro9 = __toESM(require("effect/Micro"));
-var makeClientConfigFrom = (input) => Micro9.gen(function* () {
+var Micro5 = __toESM(require("effect/Micro"));
+var makeClientConfigFrom = (input) => Micro5.gen(function* () {
   if (input.type == "config") {
     return makeTgBotClientConfig(input);
   }
-  const config = yield* Micro9.tryPromise({
+  const config = yield* Micro5.tryPromise({
     try: async () => {
       const { readFileSync } = await import("fs");
       return JSON.parse(await readFileSync("config.json", "utf-8"));
     },
     catch: (error) => {
-      console.warn(error);
+      console.warn("invalid tg bot config", error);
       return "ReadingConfigError";
     }
   });
   if (!isTgBotClientSettingsInput(config)) {
-    return yield* Micro9.fail("InvalidConfig");
+    return yield* Micro5.fail("InvalidConfig");
   }
   return makeTgBotClientConfig(config);
 });
 // src/bot/factory/make-bot.ts
-var Micro10 = __toESM(require("effect/Micro"));
-var makeBot = (messageHandler) => Micro10.gen(function* () {
-  const { runBot } = yield* Micro10.service(BotUpdatePollerService);
+var Micro6 = __toESM(require("effect/Micro"));
+var makeBot = (messageHandler) => Micro6.gen(function* () {
+  const { runBot } = yield* Micro6.service(BotUpdatePollerService);
+  const fiber = yield* runBot(messageHandler);
+  const interrupt = Micro6.fiberInterrupt(fiber);
   return {
-    fiber: yield* runBot(messageHandler),
-    runBot
+    runBot,
+    interrupt
   };
 }).pipe(
-  Micro10.tapError((error) => {
+  Micro6.tapError((error) => {
     console.error(error);
-    return Micro10.void;
+    return Micro6.void;
   })
 );
 // src/bot/factory/_service.ts
-var BotFactoryService = class extends Context5.Tag("BotFactoryService")() {
+var BotFactoryService = class extends Context3.Tag("BotFactoryService")() {
 };
 var BotFactoryServiceDefault = {
   makeBot,
-  runBot: (input) => Micro11.gen(function* () {
-    console.log("client");
-    const client = yield* makeClientConfigFrom(input);
+  runBot: (input) => Micro7.gen(function* () {
+    const client = Context3.make(TgBotClientConfig, yield* makeClientConfigFrom(input));
     const poller = yield* BotUpdatesPollerServiceDefault.pipe(
-      Micro11.provideService(TgBotClientConfig, client)
+      Micro7.provideContext(client)
     );
     const bot = yield* makeBot(input).pipe(
-      Micro11.provideService(BotUpdatePollerService, poller)
+      Micro7.provideContext(client),
+      Micro7.provideService(BotUpdatePollerService, poller)
+    );
+    const reload = (input2) => bot.runBot(input2).pipe(
+      Micro7.provideContext(client)
     );
-    const reload = (input2) => bot.runBot(input2).pipe(Micro11.runPromise);
     return {
-      reload
+      reload,
+      bot
     };
   })
 };
 // src/bot/run.ts
-var runTgChatBot = (input) => BotFactoryServiceDefault.runBot(input).pipe(Micro12.runPromise);
+var Micro8 = __toESM(require("effect/Micro"));
+var runTgChatBot = (input) => BotFactoryServiceDefault.runBot(input).pipe(Micro8.runPromise);
+// src/client/_client.ts
+var Micro11 = __toESM(require("effect/Micro"));
+// src/client/file/_service.ts
+var Micro10 = __toESM(require("effect/Micro"));
+var Context4 = __toESM(require("effect/Context"));
+// src/client/file/get-file.ts
+var Micro9 = __toESM(require("effect/Micro"));
+var getFile = (fileId) => Micro9.gen(function* () {
+  const response = yield* execute("get_file", { file_id: fileId });
+  const config = yield* Micro9.service(TgBotClientConfig);
+  const file_path = response.file_path;
+  if (!file_path || file_path.length == 0) {
+    return yield* Micro9.fail(
+      new TgBotClientError({
+        reason: {
+          type: "UnableToGetFile",
+          cause: "File path not defined"
+        }
+      })
+    );
+  }
+  const file_name = file_path.replaceAll("/", "-");
+  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`;
+  const fileContent = yield* Micro9.tryPromise({
+    try: () => fetch(url).then((_) => _.arrayBuffer()),
+    catch: (cause) => new TgBotClientError({
+      reason: { type: "UnableToGetFile", cause }
+    })
+  });
+  const file = new File([new Uint8Array(fileContent)], file_name);
+  return file;
+});
+// src/client/file/_service.ts
+var ClientFileService = class extends Context4.Tag("ClientFileService")() {
+};
+var ClientFileServiceDefault = Micro10.gen(function* () {
+  return {
+    getFile: (input) => getFile(input.file_id)
+  };
+});
+// src/client/_client.ts
+var makeTgBotClient = (input) => {
+  const config = makeTgBotClientConfig(input);
+  const client = Micro11.gen(function* () {
+    const file = yield* Micro11.service(ClientFileService);
+    return {
+      execute: (method, input2) => execute(method, input2).pipe(
+        Micro11.provideService(TgBotClientConfig, config),
+        Micro11.runPromise
+      ),
+      getFile: (input2) => file.getFile(input2).pipe(
+        Micro11.provideService(TgBotClientConfig, config),
+        Micro11.runPromise
+      )
+    };
+  }).pipe(
+    Micro11.provideServiceEffect(ClientFileService, ClientFileServiceDefault),
+    Micro11.provideService(TgBotClientConfig, config),
+    Micro11.runSync
+  );
+  return client;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BotFactoryService,
   BotFactoryServiceDefault,
+  BotUpdatePollerService,
+  BotUpdatesPollerServiceDefault,
   MESSAGE_EFFECTS,
   defaultBaseUrl,
   isMessageEffect,

package/dist/index.mjs CHANGED Viewed

@@ -1,5 +1,84 @@
-// src/client/_client.ts
-import * as Micro5 from "effect/Micro";
+// src/bot/factory/_service.ts
+import * as Micro7 from "effect/Micro";
+import * as Context3 from "effect/Context";
+// src/bot/update-poller/_service.ts
+import * as Micro4 from "effect/Micro";
+import * as Context2 from "effect/Context";
+// src/bot/update-poller/poll-and-handle.ts
+import * as Micro3 from "effect/Micro";
+// src/bot/update-poller/settings.ts
+var makeSettingsFrom = (input) => {
+  let limit = input.batch_size ?? 10;
+  let timeout = input.timeout ?? 10;
+  let max_empty_responses = input.max_empty_responses;
+  let update_types = input.update_types;
+  let log_level = input.log_level;
+  if (limit < 10 || limit > 100) {
+    console.warn("Wrong limit, must be in [10..100], using 10 instead");
+    limit = 10;
+  }
+  if (timeout < 2 || timeout > 10) {
+    console.warn("Wrong timeout, must be in [2..10], using 2 instead");
+    limit = 10;
+  }
+  if (max_empty_responses && max_empty_responses < 2) {
+    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
+    max_empty_responses = void 0;
+  }
+  if (max_empty_responses && max_empty_responses < 2) {
+    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
+    max_empty_responses = void 0;
+  }
+  if (!update_types) {
+    console.info("Handling only messages, ignoring others");
+    update_types = ["message"];
+  }
+  if (!log_level) {
+    log_level = "info";
+  }
+  return {
+    limit,
+    timeout,
+    max_empty_responses,
+    update_types,
+    log_level
+  };
+};
+// src/bot/update-poller/fetch-updates.ts
+import * as Micro2 from "effect/Micro";
+// src/bot/message-handler/utils.ts
+var extractUpdate = (input) => {
+  for (const [field, value] of Object.entries(input)) {
+    if (field == "update_id") {
+      continue;
+    }
+    return {
+      type: field,
+      ...value
+    };
+  }
+  return;
+};
+// src/client/execute-request/execute.ts
+import * as Micro from "effect/Micro";
+import * as String from "effect/String";
+// src/client/errors.ts
+import * as Data from "effect/Data";
+var TgBotClientError = class _TgBotClientError extends Data.TaggedError("TgBotClientError") {
+  static missingSuccess = new _TgBotClientError({
+    reason: {
+      type: "ClientInternalError",
+      cause: "Expected 'success' to be defined"
+    }
+  });
+};
 // src/client/config.ts
 import * as Context from "effect/Context";
@@ -27,25 +106,6 @@ var makeTgBotClientConfig = (input) => TgBotClientConfig.of({
 var TgBotClientConfig = class extends Context.Tag("TgBotClientConfig")() {
 };
-// src/client/execute-request/_service.ts
-import * as Micro2 from "effect/Micro";
-import * as Context2 from "effect/Context";
-// src/client/execute-request/execute.ts
-import * as Micro from "effect/Micro";
-import * as String from "effect/String";
-// src/client/errors.ts
-import * as Data from "effect/Data";
-var TgBotClientError = class _TgBotClientError extends Data.TaggedError("TgBotClientError") {
-  static missingSuccess = new _TgBotClientError({
-    reason: {
-      type: "ClientInternalError",
-      cause: "Expected 'success' to be defined"
-    }
-  });
-};
 // src/client/guards.ts
 var isFileContent = (input) => typeof input == "object" && input != null && ("file_content" in input && input.file_content instanceof Uint8Array) && ("file_name" in input && typeof input.file_name == "string");
 var isTgBotApiResponse = (input) => typeof input == "object" && input != null && ("ok" in input && typeof input.ok == "boolean");
@@ -70,7 +130,8 @@ var makePayload = (body) => {
 };
 // src/client/execute-request/execute.ts
-var execute = (config, method, input) => Micro.gen(function* () {
+var execute = (method, input) => Micro.gen(function* () {
+  const config = yield* Micro.service(TgBotClientConfig);
   const httpResponse = yield* Micro.tryPromise({
     try: () => fetch(
       `${config.base_url}/bot${config.bot_token}/${String.snakeToCamel(method)}`,
@@ -106,160 +167,17 @@ var execute = (config, method, input) => Micro.gen(function* () {
   return response.result;
 });
-// src/client/execute-request/_service.ts
-var ClientExecuteRequestService = class extends Context2.Tag("ClientExecuteRequestService")() {
-};
-var ClientExecuteRequestServiceDefault = Micro2.gen(function* () {
-  const config = yield* Micro2.service(TgBotClientConfig);
-  return {
-    execute: (method, input) => execute(config, method, input)
-  };
-});
-// src/client/file/_service.ts
-import * as Micro4 from "effect/Micro";
-import * as Context3 from "effect/Context";
-// src/client/file/get-file.ts
-import * as Micro3 from "effect/Micro";
-var getFile = (fileId, config, execute2) => Micro3.gen(function* () {
-  const response = yield* execute2.execute("get_file", { file_id: fileId });
-  const file_path = response.file_path;
-  if (!file_path || file_path.length == 0) {
-    return yield* Micro3.fail(
-      new TgBotClientError({
-        reason: {
-          type: "UnableToGetFile",
-          cause: "File path not defined"
-        }
-      })
-    );
-  }
-  const file_name = file_path.replaceAll("/", "-");
-  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`;
-  const fileContent = yield* Micro3.tryPromise({
-    try: () => fetch(url).then((_) => _.arrayBuffer()),
-    catch: (cause) => new TgBotClientError({
-      reason: { type: "UnableToGetFile", cause }
-    })
-  });
-  const file = new File([new Uint8Array(fileContent)], file_name);
-  return file;
-});
-// src/client/file/_service.ts
-var ClientFileService = class extends Context3.Tag("ClientFileService")() {
-};
-var ClientFileServiceDefault = Micro4.gen(function* () {
-  const config = yield* Micro4.service(TgBotClientConfig);
-  const execute2 = yield* Micro4.service(ClientExecuteRequestService);
-  return {
-    getFile: (input) => getFile(input.file_id, config, execute2)
-  };
-}).pipe(
-  Micro4.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault)
-);
-// src/client/_client.ts
-var makeTgBotClient = (input) => {
-  const config = makeTgBotClientConfig(input);
-  const client = Micro5.gen(function* () {
-    const execute2 = yield* Micro5.service(ClientExecuteRequestService);
-    const file = yield* Micro5.service(ClientFileService);
-    return {
-      execute: (method, input2) => execute2.execute(method, input2).pipe(Micro5.runPromise),
-      getFile: (input2) => file.getFile(input2).pipe(Micro5.runPromise)
-    };
-  }).pipe(
-    Micro5.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault),
-    Micro5.provideServiceEffect(ClientFileService, ClientFileServiceDefault),
-    Micro5.provideService(TgBotClientConfig, config),
-    Micro5.runSync
-  );
-  return client;
-};
-// src/bot/run.ts
-import * as Micro12 from "effect/Micro";
-// src/bot/factory/_service.ts
-import * as Micro11 from "effect/Micro";
-import * as Context5 from "effect/Context";
-// src/bot/update-poller/_service.ts
-import * as Micro8 from "effect/Micro";
-import * as Context4 from "effect/Context";
-// src/bot/update-poller/poll-and-handle.ts
-import * as Micro7 from "effect/Micro";
-// src/bot/update-poller/settings.ts
-var makeSettingsFrom = (input) => {
-  let limit = input.batch_size ?? 10;
-  let timeout = input.timeout ?? 10;
-  let max_empty_responses = input.max_empty_responses;
-  let update_types = input.update_types;
-  let log_level = input.log_level;
-  if (limit < 10 || limit > 100) {
-    console.warn("Wrong limit, must be in [10..100], using 10 instead");
-    limit = 10;
-  }
-  if (timeout < 2 || timeout > 10) {
-    console.warn("Wrong timeout, must be in [2..10], using 2 instead");
-    limit = 10;
-  }
-  if (max_empty_responses && max_empty_responses < 2) {
-    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
-    max_empty_responses = void 0;
-  }
-  if (max_empty_responses && max_empty_responses < 2) {
-    console.warn("Wrong max_empty_responses, must be in [2..infinity], using infinity");
-    max_empty_responses = void 0;
-  }
-  if (!update_types) {
-    console.info("Handling only messages, ignoring others");
-    update_types = ["message"];
-  }
-  if (!log_level) {
-    log_level = "info";
-  }
-  return {
-    limit,
-    timeout,
-    max_empty_responses,
-    update_types,
-    log_level
-  };
-};
 // src/bot/update-poller/fetch-updates.ts
-import * as Micro6 from "effect/Micro";
-// src/bot/message-handler/utils.ts
-var extractUpdate = (input) => {
-  for (const [field, value] of Object.entries(input)) {
-    if (field == "update_id") {
-      continue;
-    }
-    return {
-      type: field,
-      ...value
-    };
-  }
-  return;
-};
-// src/bot/update-poller/fetch-updates.ts
-var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro6.gen(function* () {
+var fetchUpdates = ({ state, settings, handlers }) => Micro2.gen(function* () {
   const updateId = state.lastUpdateId;
   if (settings.log_level == "debug") {
     console.debug("getting updates", state);
   }
-  const updates = yield* execute2("get_updates", {
+  const updates = yield* execute("get_updates", {
     ...settings,
     ...updateId ? { offset: updateId } : void 0
   }).pipe(
-    Micro6.andThen((_) => _.sort((_2) => _2.update_id))
+    Micro2.andThen((_) => _.sort((_2) => _2.update_id))
   );
   let lastSuccessId = void 0;
   let hasError = false;
@@ -293,7 +211,7 @@ var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro6.
     }
     const handleResult = handler(update);
     if ("chat" in update && handleResult) {
-      const response = yield* execute2(`send_${handleResult.type}`, {
+      const response = yield* execute(`send_${handleResult.type}`, {
         ...handleResult,
         chat_id: update.chat.id
       });
@@ -308,7 +226,7 @@ var fetchUpdates = ({ state, settings, execute: execute2, handlers }) => Micro6.
     lastSuccessId = updateObject.update_id;
   }
   if (hasError && lastSuccessId) {
-    yield* execute2("get_updates", {
+    yield* execute("get_updates", {
       offset: lastSuccessId,
       limit: 0
     });
@@ -326,15 +244,14 @@ var pollAndHandle = (input) => {
     emptyResponses: 0
   };
   const settings = makeSettingsFrom(input.settings);
-  return Micro7.delay(1e3)(
+  return Micro3.delay(1e3)(
     fetchUpdates({
       state,
       settings,
-      execute: input.execute,
       handlers: input.settings
     })
   ).pipe(
-    Micro7.repeat({
+    Micro3.repeat({
       while: ({ updates, lastSuccessId, hasError }) => {
         if (hasError) {
           console.info("error in handler, quitting");
@@ -360,22 +277,19 @@ var pollAndHandle = (input) => {
 };
 // src/bot/update-poller/_service.ts
-var BotUpdatePollerService = class extends Context4.Tag("BotUpdatePollerService")() {
+var BotUpdatePollerService = class extends Context2.Tag("BotUpdatePollerService")() {
 };
-var BotUpdatesPollerServiceDefault = Micro8.gen(function* () {
+var BotUpdatesPollerServiceDefault = Micro4.gen(function* () {
   console.log("Initiating BotUpdatesPollerServiceDefault");
   const state = {
     fiber: void 0
   };
-  const client = yield* Micro8.service(ClientExecuteRequestService);
-  const runBot = (messageHandler) => Micro8.gen(function* () {
-    console.log(state);
+  const runBot = (messageHandler) => Micro4.gen(function* () {
     const startFiber = pollAndHandle({
-      settings: messageHandler,
-      execute: client.execute
+      settings: messageHandler
     }).pipe(
-      Micro8.forkDaemon,
-      Micro8.tap(
+      Micro4.forkDaemon,
+      Micro4.tap(
         (fiber) => fiber.addObserver((exit) => {
           console.log("bot's fiber has been closed", exit);
           if (messageHandler.onExit) {
@@ -386,82 +300,155 @@ var BotUpdatesPollerServiceDefault = Micro8.gen(function* () {
     );
     if (state.fiber) {
       console.log("killing previous bot's fiber");
-      yield* Micro8.fiberInterrupt(state.fiber);
+      yield* Micro4.fiberInterrupt(state.fiber);
     }
     state.fiber = yield* startFiber;
-    console.log("Reading bot's updates.....", state.fiber == null);
+    console.log("Fetching bot updates via long polling...");
     return state.fiber;
   });
   return {
     runBot
   };
-}).pipe(
-  Micro8.provideServiceEffect(ClientExecuteRequestService, ClientExecuteRequestServiceDefault)
-);
+});
 // src/bot/factory/client-config.ts
-import * as Micro9 from "effect/Micro";
-var makeClientConfigFrom = (input) => Micro9.gen(function* () {
+import * as Micro5 from "effect/Micro";
+var makeClientConfigFrom = (input) => Micro5.gen(function* () {
   if (input.type == "config") {
     return makeTgBotClientConfig(input);
   }
-  const config = yield* Micro9.tryPromise({
+  const config = yield* Micro5.tryPromise({
     try: async () => {
       const { readFileSync } = await import("fs");
       return JSON.parse(await readFileSync("config.json", "utf-8"));
     },
     catch: (error) => {
-      console.warn(error);
+      console.warn("invalid tg bot config", error);
       return "ReadingConfigError";
     }
   });
   if (!isTgBotClientSettingsInput(config)) {
-    return yield* Micro9.fail("InvalidConfig");
+    return yield* Micro5.fail("InvalidConfig");
   }
   return makeTgBotClientConfig(config);
 });
 // src/bot/factory/make-bot.ts
-import * as Micro10 from "effect/Micro";
-var makeBot = (messageHandler) => Micro10.gen(function* () {
-  const { runBot } = yield* Micro10.service(BotUpdatePollerService);
+import * as Micro6 from "effect/Micro";
+var makeBot = (messageHandler) => Micro6.gen(function* () {
+  const { runBot } = yield* Micro6.service(BotUpdatePollerService);
+  const fiber = yield* runBot(messageHandler);
+  const interrupt = Micro6.fiberInterrupt(fiber);
   return {
-    fiber: yield* runBot(messageHandler),
-    runBot
+    runBot,
+    interrupt
   };
 }).pipe(
-  Micro10.tapError((error) => {
+  Micro6.tapError((error) => {
     console.error(error);
-    return Micro10.void;
+    return Micro6.void;
   })
 );
 // src/bot/factory/_service.ts
-var BotFactoryService = class extends Context5.Tag("BotFactoryService")() {
+var BotFactoryService = class extends Context3.Tag("BotFactoryService")() {
 };
 var BotFactoryServiceDefault = {
   makeBot,
-  runBot: (input) => Micro11.gen(function* () {
-    console.log("client");
-    const client = yield* makeClientConfigFrom(input);
+  runBot: (input) => Micro7.gen(function* () {
+    const client = Context3.make(TgBotClientConfig, yield* makeClientConfigFrom(input));
     const poller = yield* BotUpdatesPollerServiceDefault.pipe(
-      Micro11.provideService(TgBotClientConfig, client)
+      Micro7.provideContext(client)
     );
     const bot = yield* makeBot(input).pipe(
-      Micro11.provideService(BotUpdatePollerService, poller)
+      Micro7.provideContext(client),
+      Micro7.provideService(BotUpdatePollerService, poller)
+    );
+    const reload = (input2) => bot.runBot(input2).pipe(
+      Micro7.provideContext(client)
     );
-    const reload = (input2) => bot.runBot(input2).pipe(Micro11.runPromise);
     return {
-      reload
+      reload,
+      bot
     };
   })
 };
 // src/bot/run.ts
-var runTgChatBot = (input) => BotFactoryServiceDefault.runBot(input).pipe(Micro12.runPromise);
+import * as Micro8 from "effect/Micro";
+var runTgChatBot = (input) => BotFactoryServiceDefault.runBot(input).pipe(Micro8.runPromise);
+// src/client/_client.ts
+import * as Micro11 from "effect/Micro";
+// src/client/file/_service.ts
+import * as Micro10 from "effect/Micro";
+import * as Context4 from "effect/Context";
+// src/client/file/get-file.ts
+import * as Micro9 from "effect/Micro";
+var getFile = (fileId) => Micro9.gen(function* () {
+  const response = yield* execute("get_file", { file_id: fileId });
+  const config = yield* Micro9.service(TgBotClientConfig);
+  const file_path = response.file_path;
+  if (!file_path || file_path.length == 0) {
+    return yield* Micro9.fail(
+      new TgBotClientError({
+        reason: {
+          type: "UnableToGetFile",
+          cause: "File path not defined"
+        }
+      })
+    );
+  }
+  const file_name = file_path.replaceAll("/", "-");
+  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`;
+  const fileContent = yield* Micro9.tryPromise({
+    try: () => fetch(url).then((_) => _.arrayBuffer()),
+    catch: (cause) => new TgBotClientError({
+      reason: { type: "UnableToGetFile", cause }
+    })
+  });
+  const file = new File([new Uint8Array(fileContent)], file_name);
+  return file;
+});
+// src/client/file/_service.ts
+var ClientFileService = class extends Context4.Tag("ClientFileService")() {
+};
+var ClientFileServiceDefault = Micro10.gen(function* () {
+  return {
+    getFile: (input) => getFile(input.file_id)
+  };
+});
+// src/client/_client.ts
+var makeTgBotClient = (input) => {
+  const config = makeTgBotClientConfig(input);
+  const client = Micro11.gen(function* () {
+    const file = yield* Micro11.service(ClientFileService);
+    return {
+      execute: (method, input2) => execute(method, input2).pipe(
+        Micro11.provideService(TgBotClientConfig, config),
+        Micro11.runPromise
+      ),
+      getFile: (input2) => file.getFile(input2).pipe(
+        Micro11.provideService(TgBotClientConfig, config),
+        Micro11.runPromise
+      )
+    };
+  }).pipe(
+    Micro11.provideServiceEffect(ClientFileService, ClientFileServiceDefault),
+    Micro11.provideService(TgBotClientConfig, config),
+    Micro11.runSync
+  );
+  return client;
+};
 export {
   BotFactoryService,
   BotFactoryServiceDefault,
+  BotUpdatePollerService,
+  BotUpdatesPollerServiceDefault,
   MESSAGE_EFFECTS,
   defaultBaseUrl,
   isMessageEffect,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@effect-ak/tg-bot-client",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "homepage": "https://effect-ak.github.io/telegram-bot-client",
   "author": {
     "name": "Aleksandr Kondaurov",