lib-vk - npm Package Compare versions

Comparing version 1.1.2 to 2.0.0

lib-vk/utils/messageStruct.js

 module.exports = 
 {
+    // Adding a new message.
     4: {
-        // Adding a new message.
         type: 'messageNew',
@@ -15,4 +15,4 @@ struct: [
     },
+    // Edit the message.
     5: {
-        // Edit the message.
         type: 'messageEdit',
@@ -28,4 +28,4 @@ struct: [
     },
+    // Reading all outgoing messages in $peerId that arrived before the message with $localId
     7: {
-        // Reading all outgoing messages in $peerId that arrived before the message with $localId
         type: 'readingAllOutMessages',
@@ -127,4 +127,3 @@ struct: [
     },
-    /** Users $userIds record an audio message in the conversation $peerId.
-    */
+    // Users $userIds record an audio message in the conversation $peerId.
     64: {
@@ -131,0 +130,0 @@ type: 'recordsAudiomessage',

lib-vk/VK.js

@@ -1,6 +0,6 @@
-const axios = require('axios').default;
-const callback = require('express')();
-const bodyParser = require('body-parser');
-const httpAgent = new (require('http')).Agent({ keepAlive: true });
-const Message = require('./Message');
+const { fetch } = require('undici'),
+{ App: uWS, us_listen_socket_close: serverClose } = require('uWebSockets.js'),
+Message = require('./message'),
+now = require("performance-now"),
+readJson = require('./utils/readJson')
 
@@ -10,37 +10,34 @@
 {
-    constructor(options) 
+    constructor(options = {})
     {
-        if(options.longPoll) 
-        {
-            this.groupId = options.longPoll.groupId;
-            this.token = options.longPoll.token;
-        }
+        options.longPoll && (this.token = options.longPoll.token) && (this.groupId = options.longPoll.groupId)
+        options.callback && (this.secret = options.callback.secret) && (this.path = options.callback.path) && (this.callback = {listenSocket: {}, port: options.callback.port ?? 80})
 
-        if(options.callback) 
-        {
-            this.secret = options.callback.secret;
-            this.path = options.callback.path;
-            callback.use(bodyParser.json()) && callback.listen(80);
-        }
 
-
         // default..
-        this.arrayKey = new Map();
+        this.paramsQueryVK = {ts: 0, server: '', key: ''},
+        this.mapKeys = new Map(),
+        this.mapCallbacks = [],
+        this.startGetingNewEvents = {longPoll: true, callback: true}
+        this.#start()
     }
 
 
-    /** Executing multiple methods at a time 
-    *   Returns an array of received responses from methods
-    *    Example of a structure:
-    *     [constant].parallelExecute([ [ [ [ 'name of the method', {parameter object}], .. ], 'Working with answers [this]' ], .. ])
+    /** Executing multiple methods at a time
+    *
+    * @param params
+    * @returns {Promise<*>}
+    *
+    * Returns an array of received responses from methods
+    * Example of a structure:
+    * `[constant].parallelExecute([ [ [ [ 'name of the method', {parameter object}], .. ], 'Working with answers [this]' ], .. ])`
     */
-    async parallelExecute(params = []) 
+    parallelExecute(params = []) 
     {
         return this.Query('execute', {code: `
             var refunds = [];
-            ${params.map(element => 
-                `var this = [${element[0].map(x=> `API.${x[0]}(${JSON.stringify(x[1])})`).join(',')}]${element[1] ? ';' : ''}
-                ${element[1] ? `refunds.push([this, API.${element[1]}])` : ''}`).join(';')};
-            return refunds;
-        `});
+            ${params.map(element =>
+                `var this = [${element[0].map(x => `API.${x[0]}(${JSON.stringify(x[1])})`).join(',')}];
+                ${element[1] ? `refunds.push([this, API.${element[1]}])` : 'refunds.push([this])'}`).join(';')};
+            return refunds;`})
     }
@@ -50,93 +47,168 @@
     /** excludes a person or people from the conversation:
-     *   [constant].chatKick([ids array])
-     *    newMessage.chatKick([1, 2, 3])
+    *
+    * @param message
+    * @param ids
+    * @returns {Promise<Promise<*>|*>}
+    *
+    * `[constant].chatKick([ids array])
+    * VK.chatKick([1, 2, 3])`
     */
-    async chatKick(message, ids = []) 
+    chatKick(message, ids = []) 
     {
         return Array.isArray(ids) 
-            ? this.parallelExecute([[ ids.map(x => { return ['messages.removeChatUser', {chat_id: message.peer_id - 2000000000, member_id: x}] }) ]])
-            : this.Query('messages.removeChatUser', {chat_id: message.peer_id - 2000000000, member_id: ids});
+            ? this.parallelExecute([[ ids.map(x => { return ['messages.removeChatUser', {chat_id: message.peer_id - 2e9, member_id: x}] }) ]])
+            : this.Query('messages.removeChatUser', {chat_id: message.peer_id - 2e9, member_id: ids})
     }
 
 
-    /** simplified message sending, example: 
-    *    [constant].send({incoming message object}, 'Hello!')
-    *      newMessage.send('Hello!')
-    * 
-    *    or 
-    *     [constant].send({parameter object})
-    *      newMessage.send({message: 'Hello!', chat_id: 1, random_id: 0})
+    /** simplified message sending, example:
+    *
+    * @param message
+    * @param params
+    * @returns {Promise<*>}
+    *
+    * `[constant].send({incoming message object}, 'Hello!')
+    *   VK.send(message, 'Hello!')
+    *
+    *  or
+    *   [constant].send({parameter object})
+    *    VK.send({message: 'Hello!', chat_id: 1, random_id: 0})`
     */
     async send(message, params = {})
     {
-        return this.Query('messages.send', typeof params === 'string' ? {message: params, peer_id: message.peer_id, random_id: 0} : (params.chat_id ? params : (params.peer_id ? params : (params.peer_id = message.peer_id) && params)));
+        typeof params === 'object' && !(params.peer_id = message.peer_id ?? message.peerId) && (params.chat_id = params.chat_id ?? params.chatId)
+        return this.Query('messages.send', typeof params === 'string' ? {message: params, peer_id: message.peer_id, random_id: 0} : (params.chat_id ? params : (message.peer_id ? params : (params.peer_id = message.peer_id) && params)))
     }
 
-    
-    // sends a reply message, the parameters are similar in meaning to «send»
+
+    /** sends a reply message, the parameters are similar in meaning to «send»
+    *
+    * @param message
+    * @param params
+    * @returns {Promise<*>}
+    */
     reply(message, params = {}) 
     {
-        return this.send(message, {
-            random_id: 0,
-            forward: JSON.stringify({
-            ...(this.conversation_message_id ? { conversation_message_ids: message.conversation_message_id } : { message_ids: message.id }),
-            peer_id: message.peer_id,
-            is_reply: true
-        }), 
-        ...(typeof params === 'string' ? ({message: params}) : params)});
+        return this.send(message, {random_id: 0, forward: JSON.stringify({...(message.conversation_message_id ? { conversation_message_ids: message.conversation_message_id } : { message_ids: message.id }), peer_id: message.peer_id, is_reply: true}), ...(typeof params === 'string' ? ({message: params}) : params)})
     }
 
 
-    /** how to use
-    *    [constant].track('event name', function => {})
-    *     VK.track('message_new', newMessage => VK.reply(newMessage, 'Hello!'))
+    /** start receiving new events
+    *
+    * @params type
+    * @returns {Promise<void>}
     */
-    async track(type, func) 
+    async #start(type)
     {
-        (this.secret && this.path) && callback.post(this.path, (req, res) => 
-        {
-            const update = req.body;
-            if(update.type === 'confirmation') return res.send(this.secret);
-            !this.arrayKey.has(update.event_id) && (this.eventPush(update, [type, func]) || this.arrayKey.set(update.event_id));
-            return res.send('OK');
-        });
+        ((type === 'callback' || !type) && this.startGetingNewEvents.callback) && (this.secret && this.path) && 
+            uWS().post(this.path, (response, request) => {
+                if(request.getHeader('x-retry-counter')) return response.end('OK')
+                readJson(response, newEvent =>
+                {
+                    if(newEvent.type === 'confirmation') return response.end(this.secret)
+                    newEvent.object.message && (newEvent.object.message.test = {bornOfset: now(), modeEvent: 2});
+                    !this.mapKeys.has(newEvent.event_id) && (this.#eventPush(newEvent) || this.mapKeys.set(newEvent.event_id))
+                    response.end('OK')
+                })
+            }).listen(this.callback.port, listenSocket => this.callback.listenSocket = listenSocket)
 
-        let {key, server, ts} = (await this.Query(this.groupId ? 'groups.getLongPollServer' : 'messages.getLongPollServer', {[this.groupId ? 'group_id' : 'lp_version']: this.groupId ?? 3})).response;
-        while (true)
-        {
-            const response = (await axios.get(this.groupId ? server : 'https://' + server, {params: {key: key, act: 'a_check', wait: 25, ts: ts, mode: '2 | 8 | 32 | 64 | 128', version: 3 , httpAgent: httpAgent}})).data;
-            ts = response.ts;
-            if(response.updates) for (const update of response.updates) {(!this.path || !this.arrayKey.has(update.event_id)) && (this.eventPush(this.groupId ? update : new Message(update), [type, func]) || this.arrayKey.set(update.event_id))};
-        };
+
+        if((type === 'longPoll' || !type) && this.startGetingNewEvents.longPoll)
+            for(;this.startGetingNewEvents.longPoll;)
+                for(let newEvent of await this.#getingUpdates())
+                    {
+                        newEvent.object && newEvent.object.message && (newEvent.object.message.test = {bornOfset: now(), modeEvent: 1});
+                        (!this.path || !this.mapKeys.has(newEvent.event_id)) && (this.#eventPush(this.groupId ? newEvent : new Message(newEvent)) || this.mapKeys.set(newEvent.event_id))
+                    }
     }
-    
 
-    
-    // a chat message?
+
+    /** Getting new events
+    *
+    * @returns {Promise<[*]>}
+    */
+    async #getingUpdates()
+    {
+        !this.paramsQueryVK.key && ({server: this.paramsQueryVK.server, key: this.paramsQueryVK.key, ts: this.paramsQueryVK.ts} = (await this.Query(this.groupId ? 'groups.getLongPollServer' : 'messages.getLongPollServer', {[this.groupId ? 'group_id' : 'lp_version']: this.groupId ?? 3}).catch(error => console.error(error))).response)
+        const response = (await (await fetch(this.groupId ? this.paramsQueryVK.server : 'https://' + this.paramsQueryVK.server, { body: new URLSearchParams({key: this.paramsQueryVK.key, act: 'a_check', wait: 25, ts: this.paramsQueryVK.ts, mode: '2 | 8 | 32 | 64 | 128', version: 3}), method: 'POST'}).catch(() => this.paramsQueryVK.key = '')).json())
+        return ((response.failed === 2 || response.failed === 3) && ((this.paramsQueryVK.key = '') || [])) || ((this.paramsQueryVK.ts = response.ts) && response.updates)
+    }
+
+
+    /** how to use
+    *
+    * @param type
+    * @param func
+    * @returns {void}
+    * 
+    * `[constant].track('event name', function => {})
+    *  VK.track('message_new', newMessage => VK.reply(newMessage, 'Hello!'))`
+    */
+    track(type, func)
+    {
+        this.mapCallbacks.push([type, func])
+    }
+
+
+    /** a chat message?
+    *
+    * @param message
+    * @returns {boolean}
+    */
     isChat(message)
     {
-        return message.peer_id > 2e9;
+        return (message.peer_id ?? message.peerId) > 2e9
     }
 
 
-    // checking for a reply message
+    /** checking for a reply message
+    *
+    * @param message
+    * @returns {boolean}
+    */
     hasReply(message)
     {
-        return !!message.reply_message;
+        return !!(message.reply_message ?? message.replyMessage)
     }
 
 
-    /** calling methods, example: 
-    *    [constant].Query('name of the method', {parameter object})
-    *      newMessage.Query('messages.send', {random_id: 0, chat_id: 1, message: 'Hello!'}) 
+    /** Switching between event receiving types or turning them off
+    *
+    * @param longPoll
+    * @param callback
+    * @returns {longPoll: boolean, callback: boolean}
     */
+    setTypeEventReceipt({longPoll, callback: callBack})
+    {
+        (typeof callBack === 'boolean' && this.startGetingNewEvents.callback !== callBack) && ((this.startGetingNewEvents.callback = callBack) ? this.#start('callback') : serverClose(this.callback.listenSocket));
+        (typeof longPoll === 'boolean' && this.startGetingNewEvents.longPoll !== longPoll) && (this.startGetingNewEvents.longPoll = longPoll) && this.#start('longPoll');
+        
+        !this.startGetingNewEvents.longPoll && !this.startGetingNewEvents.callback && ((this.startGetingNewEvents.longPoll = true) && this.#start('longPoll'))
+        return this.startGetingNewEvents
+    }
+
+
+    /** calling methods, example:
+    *
+    * @param method
+    * @param params
+    * @returns {*}
+    *
+    * `[constant].Query('name of the method', {parameter object})
+    * VK.Query('messages.send', {random_id: 0, chat_id: 1, message: 'Hello!'})`
+    */
     async Query(method, params)
     {
-        return (await axios.get(`https://api.vk.com/method/${method}`, {params: {access_token: this.token, v: '5.131', ...params}})).data;
+        return await (await fetch('https://api.vk.com/method/' + method, { body: new URLSearchParams({ access_token: this.token, v: '5.131', ...params }), method: 'POST' })).json()
     }
 
 
-    async loadingMessage(message) 
+    /** Uploading a message
+    *
+    * @param message
+    * @returns {Promise<{*}>}
+    */
+    async loadingMessage(message)
     {
-        return (await this.Query('messages.getById', {message_ids: [message.id]})).response.items[0];
+        return (await this.Query('messages.getById', {message_ids: [message.id]})).response.items[0]
     }
@@ -146,11 +218,10 @@
     /** sending events to your function
-    *    @param {update} — the object of the new event
-    *    @param {key} — the key stores the name of your event (key[0]) and the function (key[1])
+    *
+    * @param update
     */
-    eventPush(update, key) 
+    #eventPush(update)
     {
-        (key[0].includes(update.type) || !key[0]) && key[1](update.object ? update.object.message : update); this.arrayKey.size >= 150 && this.arrayKey.clear()
+        this.mapCallbacks.forEach(key => {(key[0] === update.type || !key[0]) && key[1](update.object ? ((update.object.typeEvent = update.type) && update.object) : update); this.mapKeys.size >= 150 && this.mapKeys.clear()})
     }
 }
-
-exports.VK = VK;
+exports.VK = VK

package.json

 {
     "name": "lib-vk",
-    "version": "1.1.2",
+    "version": "2.0.0",
     "description": "Compact SDK with VK API for Node.js",
@@ -28,5 +28,5 @@ "main": "./lib-vk/VK.js",
     "dependencies": {
-      "body-parser": "^1.19.1",
-      "express": "^4.17.2",
-      "axios": "^0.24.0"
+      "undici": "^5.0.0",
+      "uWebSockets.js": "^20.6.0",
+      "performance-now": "^2.1.0"
     },
@@ -33,0 +33,0 @@ "bugs": {

README.md

@@ -37,3 +37,6 @@ # lib-vk
 */ 
-vk.track('messageNew', message => message.text == 'test' && vk.reply(message, 'This is a reply message') && vk.send(message, 'This is a normal message'))
+vk.track('messageNew', message => 
+  message.text == 'test' &&
+  vk.reply(message, 'This is a reply message') &&
+  vk.send(message, 'This is a normal message'))
 ```
@@ -45,3 +48,3 @@
 
-// Calling multiple methods at once 
+// Calling multiple methods at once
 const response = await vk.parallelExecute([[ 
@@ -63,10 +66,10 @@ [
     [
-      [['messages.removeChatUser', {member_id: message.reply_message.from_id, chat_id: message.peer_id - 2000000000}],
+      [['messages.removeChatUser', {member_id: message.reply_message.from_id, chat_id: message.peer_id - 2e9}],
       ['users.get', {user_ids: message.reply_message.from_id}]],
         `messages.send({random_id: 0, message: !this[0] 
           ? ("Не могу исключить ${message.reply_message.from_id > 0 ? '@id" + this[1][0].id + " (этого пользователя)"' 
-            : `@club${message.reply_message.from_id * -1} (это сообщество)"`}) 
+            : `@club${-message.reply_message.from_id} (это сообщество)"`}) 
               : (" ${message.reply_message.from_id > 0 ? ' @id" + this[1][0].id + "(" + this[1][0].first_name + ") исключён"' 
-                : ` Исключил @club${message.reply_message.from_id * -1} (это сообщество)"`}),
-     chat_id: ${message.peer_id - 2000000000}})`
+                : ` Исключил @club${-message.reply_message.from_id} (это сообщество)"`}),
+     chat_id: ${message.peer_id - 2e9}})`
      ]
@@ -78,4 +81,4 @@ ])
 ## The name of all events and their structure for pages
-
-- Adding a new message
+-
+ Adding a new message
 ```
@@ -82,0 +85,0 @@ * messageNew

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

21147

increased by20.13%

Number of package files

6

increased by20%

Lines of code

386

increased by29.97%

Number of lines in readme file

197

increased by1.55%

Worsened metrics

Number of medium supply chain risk alerts

2

increased by100%

Dependency changes

• + Addedperformance-now@^2.1.0

• + AddeduWebSockets.js@^20.6.0

• + Addedundici@^5.0.0

• + Added@fastify/busboy@2.1.1(transitive)

• + Addedperformance-now@2.1.0(transitive)

• + Addedundici@5.28.4(transitive)

• - Removedaxios@^0.24.0

• - Removedbody-parser@^1.19.1

• - Removedexpress@^4.17.2

• - Removedaccepts@1.3.8(transitive)

• - Removedarray-flatten@1.1.1(transitive)

• - Removedaxios@0.24.0(transitive)

• - Removedbody-parser@1.20.3(transitive)

• - Removedbytes@3.1.2(transitive)

• - Removedcall-bind@1.0.7(transitive)

• - Removedcontent-disposition@0.5.4(transitive)

• - Removedcontent-type@1.0.5(transitive)

• - Removedcookie@0.7.1(transitive)

• - Removedcookie-signature@1.0.6(transitive)

• - Removeddebug@2.6.9(transitive)

• - Removeddefine-data-property@1.1.4(transitive)

• - Removeddepd@2.0.0(transitive)

• - Removeddestroy@1.2.0(transitive)

• - Removedee-first@1.1.1(transitive)

• - Removedencodeurl@1.0.22.0.0(transitive)

• - Removedes-define-property@1.0.0(transitive)

• - Removedes-errors@1.3.0(transitive)

• - Removedescape-html@1.0.3(transitive)

• - Removedetag@1.8.1(transitive)

• - Removedexpress@4.21.1(transitive)

• - Removedfinalhandler@1.3.1(transitive)

• - Removedfollow-redirects@1.15.9(transitive)

• - Removedforwarded@0.2.0(transitive)

• - Removedfresh@0.5.2(transitive)

• - Removedfunction-bind@1.1.2(transitive)

• - Removedget-intrinsic@1.2.4(transitive)

• - Removedgopd@1.0.1(transitive)

• - Removedhas-property-descriptors@1.0.2(transitive)

• - Removedhas-proto@1.0.3(transitive)

• - Removedhas-symbols@1.0.3(transitive)

• - Removedhasown@2.0.2(transitive)

• - Removedhttp-errors@2.0.0(transitive)

• - Removediconv-lite@0.4.24(transitive)

• - Removedinherits@2.0.4(transitive)

• - Removedipaddr.js@1.9.1(transitive)

• - Removedmedia-typer@0.3.0(transitive)

• - Removedmerge-descriptors@1.0.3(transitive)

• - Removedmethods@1.1.2(transitive)

• - Removedmime@1.6.0(transitive)

• - Removedmime-db@1.52.0(transitive)

• - Removedmime-types@2.1.35(transitive)

• - Removedms@2.0.02.1.3(transitive)

• - Removednegotiator@0.6.3(transitive)

• - Removedobject-inspect@1.13.3(transitive)

• - Removedon-finished@2.4.1(transitive)

• - Removedparseurl@1.3.3(transitive)

• - Removedpath-to-regexp@0.1.10(transitive)

• - Removedproxy-addr@2.0.7(transitive)

• - Removedqs@6.13.0(transitive)

• - Removedrange-parser@1.2.1(transitive)

• - Removedraw-body@2.5.2(transitive)

• - Removedsafe-buffer@5.2.1(transitive)

• - Removedsafer-buffer@2.1.2(transitive)

• - Removedsend@0.19.0(transitive)

• - Removedserve-static@1.16.2(transitive)

• - Removedset-function-length@1.2.2(transitive)

• - Removedsetprototypeof@1.2.0(transitive)

• - Removedside-channel@1.0.6(transitive)

• - Removedstatuses@2.0.1(transitive)

• - Removedtoidentifier@1.0.1(transitive)

• - Removedtype-is@1.6.18(transitive)

• - Removedunpipe@1.0.0(transitive)

• - Removedutils-merge@1.0.1(transitive)

• - Removedvary@1.1.2(transitive)