@maxhub/max-bot-api 0.2.1 → 0.2.2

package/dist/core/helpers/upload.js

@@ -32,6 +32,68 @@ const node_crypto_1 = require("node:crypto");
 const node_path_1 = __importDefault(require("node:path"));
 const api_1 = require("../network/api");
 const DEFAULT_UPLOAD_TIMEOUT = 20000; // ms
+/**
+ * Загрузить чанк данных через Content-Range запрос
+ */
+async function uploadRangeChunk({ uploadUrl, chunk, startByte, endByte, fileSize, fileName, }, { signal } = {}) {
+    const uploadRes = await fetch(uploadUrl, {
+        method: 'POST',
+        body: chunk,
+        headers: {
+            'Content-Disposition': `attachment; filename="${fileName}"`,
+            'Content-Range': `bytes ${startByte}-${endByte}/${fileSize}`,
+            'Content-Type': 'application/x-binary; charset=x-user-defined',
+            'X-File-Name': fileName,
+            'X-Uploading-Mode': 'parallel',
+            Connection: 'keep-alive',
+        },
+        signal,
+    });
+    if (uploadRes.status >= 400) {
+        const error = await uploadRes.json();
+        throw new api_1.MaxError(uploadRes.status, error);
+    }
+    return uploadRes.text();
+}
+/**
+ * Загрузить файл через Content-Range запрос
+ */
+async function uploadRange({ uploadUrl, file }, options) {
+    const size = file.contentLength;
+    let startByte = 0;
+    let endByte = 0;
+    for await (const chunk of file.stream) {
+        endByte = startByte + chunk.length - 1;
+        await uploadRangeChunk({
+            uploadUrl,
+            startByte,
+            endByte,
+            chunk,
+            fileName: file.fileName,
+            fileSize: size,
+        }, options);
+        startByte = endByte + 1;
+    }
+}
+/**
+ * Загрузить файл через Multipart запрос
+ */
+async function uploadMultipart({ uploadUrl, file }, { signal } = {}) {
+    const body = new FormData();
+    body.append('data', {
+        [Symbol.toStringTag]: 'File',
+        name: file.fileName,
+        stream: () => file.stream,
+        size: file.contentLength,
+    });
+    const result = await fetch(uploadUrl, {
+        method: 'POST',
+        body,
+        signal,
+    });
+    const response = await result.json();
+    return response;
+}
 class Upload {
     constructor(api) {
         this.api = api;
@@ -70,7 +132,8 @@ class Upload {
             };
         };
         this.upload = async (type, file, options) => {
-            const { url: uploadUrl } = await this.api.raw.uploads.getUploadUrl({ type });
+            const res = await this.api.raw.uploads.getUploadUrl({ type });
+            const { url: uploadUrl, token } = res;
             const uploadController = new AbortController();
             const uploadInterval = setTimeout(() => {
                 uploadController.abort();
@@ -81,56 +144,31 @@ class Upload {
                         file,
                         uploadUrl,
                         abortController: uploadController,
+                        token,
                     });
                 }
                 return await this.uploadFromBuffer({
                     file,
                     uploadUrl,
                     abortController: uploadController,
+                    token,
                 });
             }
             finally {
                 clearTimeout(uploadInterval);
             }
         };
-        this.uploadFromStream = async ({ file, uploadUrl, abortController }) => {
-            return new Promise((resolve, reject) => {
-                let prevChunk = -1;
-                let uploadData = null;
-                file.stream.on('data', async (chunk) => {
-                    file.stream.pause();
-                    const startBite = prevChunk + 1;
-                    const endBite = prevChunk + chunk.length;
-                    const uploadRes = await fetch(uploadUrl, {
-                        method: 'POST',
-                        body: chunk,
-                        headers: {
-                            'Content-Disposition': `attachment; filename="${file.fileName}"`,
-                            'Content-Range': `bytes ${startBite}-${endBite}/${file.contentLength}`,
-                        },
-                        signal: abortController?.signal,
-                    });
-                    if (uploadRes.status >= 400) {
-                        const error = await uploadRes.json();
-                        throw new api_1.MaxError(uploadRes.status, error);
-                    }
-                    if (!uploadData) {
-                        uploadData = await uploadRes.json();
-                    }
-                    file.stream.resume();
-                    prevChunk += chunk.length;
-                });
-                file.stream.on('end', async () => {
-                    if (!uploadData) {
-                        reject(new Error('Failed to upload'));
-                        return;
-                    }
-                    resolve(uploadData);
-                });
-                file.stream.on('error', (err) => {
-                    reject(err);
-                });
-            });
+        this.uploadFromStream = async ({ file, uploadUrl, token, abortController, }) => {
+            if (token) {
+                await uploadRange({ file, uploadUrl }, abortController);
+                return {
+                    token,
+                    file,
+                    uploadUrl,
+                    abortController,
+                };
+            }
+            return uploadMultipart({ file, uploadUrl }, abortController);
         };
         this.uploadFromBuffer = async ({ file, uploadUrl, abortController }) => {
             const formData = new FormData();

package/dist/core/network/api/client.d.ts

@@ -1,5 +1,5 @@
 declare const defaultOptions: {
-    readonly baseUrl: "https://botapi.max.ru";
+    baseUrl: string;
 };
 export type ClientOptions = Partial<typeof defaultOptions>;
 export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';

package/dist/core/network/api/client.js

@@ -7,7 +7,7 @@ exports.createClient = void 0;
 const debug_1 = __importDefault(require("debug"));
 const debug = (0, debug_1.default)('one-me:client');
 const defaultOptions = {
-    baseUrl: 'https://botapi.max.ru',
+    baseUrl: 'https://platform-api.max.ru',
 };
 const createClient = (token, options = {}) => {
     const { baseUrl } = { ...defaultOptions, ...options };
@@ -23,7 +23,7 @@ const createClient = (token, options = {}) => {
                 },
             };
         }
-        const url = new URL(buildUrl(method, token, callOptions.path), baseUrl);
+        const url = new URL(buildUrl(method, callOptions.path), baseUrl);
         Object.keys(callOptions.query ?? {}).forEach((param) => {
             const value = callOptions.query?.[param];
             if (!value)
@@ -31,6 +31,7 @@ const createClient = (token, options = {}) => {
             url.searchParams.set(param, value.toString());
         });
         const init = { ...getResponseInit(callOptions?.body), method: httpMethod };
+        init.headers = { ...init.headers, Authorization: token };
         const res = await fetch(url.href, init);
         if (res.status === 401) {
             return {
@@ -59,7 +60,7 @@ const getResponseInit = (body) => {
         },
     };
 };
-const buildUrl = (baseUrl, token, path) => {
+const buildUrl = (baseUrl, path) => {
     let url = baseUrl;
     if (path) {
         Object.keys(path)?.forEach((key) => {
@@ -68,5 +69,5 @@ const buildUrl = (baseUrl, token, path) => {
             url = url.replace(regexp, value);
         });
     }
-    return `${url}?access_token=${token}`;
+    return url;
 };

package/dist/core/network/api/modules/messages/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessagesApi = void 0;
-const utils_1 = require("../../../../../utils");
+const promises_1 = require("node:timers/promises");
 const error_1 = require("../../error");
 const base_api_1 = require("../../base-api");
 class MessagesApi extends base_api_1.BaseApi {
@@ -28,7 +28,7 @@ class MessagesApi extends base_api_1.BaseApi {
                 if (err instanceof error_1.MaxError) {
                     if (err.code === 'attachment.not.ready') {
                         console.log('Attachment not ready');
-                        await (0, utils_1.sleep)(1000);
+                        await (0, promises_1.setTimeout)(1000);
                         return this.send({
                             chat_id, user_id, disable_link_preview, ...body,
                         });

package/dist/core/network/api/modules/uploads/types.d.ts

@@ -6,4 +6,5 @@ export type GetUploadUrlDTO = {
 };
 export type GetUploadUrlResponse = {
     url: string;
+    token?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxhub/max-bot-api",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Max Bot Framework",
   "repository": "https://github.com/max-messenger/max-bot-api-client-ts",
   "author": "Juice Development",

package/readme.md

@@ -9,7 +9,7 @@
 > Если вы новичок, то можете прочитать [официальную документацию](https://dev.max.ru/), написанную разработчиками Max
 
 ### Получение токена
-Откройте диалог с [PrimeBot](https://max.ru/primebot), следуйте инструкциям и создайте нового бота. После создания бота PrimeBot отправит вам токен.
+Откройте диалог с [Master Bot](https://max.ru/masterbot), следуйте инструкциям и создайте нового бота. После создания бота Master Bot отправит вам токен.
 
 ### Установка
 #### npm

package/dist/utils.d.ts

@@ -1,3 +0,0 @@
-import fs from 'node:fs';
-export declare const sleep: (ms: number) => Promise<void>;
-export declare const streamToBlob: (stream: fs.ReadStream, mimeType?: string) => Promise<Blob>;

package/dist/utils.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamToBlob = exports.sleep = void 0;
-const sleep = async (ms) => {
-    await new Promise((resolve) => {
-        setTimeout(resolve, ms);
-    });
-};
-exports.sleep = sleep;
-const streamToBlob = async (stream, mimeType) => {
-    return new Promise((resolve, reject) => {
-        const chunks = [];
-        stream
-            .on('data', (chunk) => chunks.push(chunk))
-            .once('end', () => {
-            const blob = mimeType
-                ? new Blob(chunks, { type: mimeType })
-                : new Blob(chunks);
-            resolve(blob);
-        })
-            .once('error', reject);
-    });
-};
-exports.streamToBlob = streamToBlob;