Define some types

Fix undefined var cookies in getCookies Update Chrome UserAgent Signed-off-by: Kazakov Stepan <[email protected]>
ksrt12 · Apr 16, 2022 · 7c53056 · 7c53056
1 parent 07a069d
commit 7c53056
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,12 @@ npm install *full path to cloned repo folder*
 
 ## Changelog
 
+Version 2.0.3 17/04/22:
+
+-   Define some types
+-   Fix undefined var cookies in getCookies
+-   Update Chrome UserAgent
+
 Version 2.0.2 14/04/22:
 
 -   Move some code out of async function

diff --git a/index.d.ts b/index.d.ts
@@ -115,16 +115,35 @@ interface device {
     item_type: string;
     groups: string[];
 }
+interface group {
+    id: string;
+    name: string;
+    type: string;
+    icon_url: string;
+    state: string;
+    capabilities: {
+        reportable: boolean;
+        retrievable: boolean;
+        type: string;
+        parameters: { split: boolean; };
+        state: {
+            instance: string;
+            value: boolean;
+        };
+        last_updated: number;
+    }[];
+    devices_count: number;
+}
 
 interface ansDevices extends ansBase {
     rooms: {
         id: string;
         name: string;
         devices: device[];
     }[];
-    groups: any[];
+    groups: group[];
     unconfigured_devices: any[];
-    speakers: any[];
+    speakers: device[];
 }
 
 interface capability {
@@ -189,4 +208,5 @@ interface myFetchParams extends fetchPutPostParams {
     color: NodeStatusFill;
     method: "GET" | "PUT" | "POST";
 }
-type myFetch = arrowPromise<myFetchParams, ansGet | ansBase>;
+type ansFetch = ansGet | ansBase;
+type myFetch = arrowPromise<myFetchParams, ansFetch>;
diff --git a/nodes/alice-send.js b/nodes/alice-send.js
@@ -42,7 +42,7 @@ module.exports = function (/** @type {RED} */ RED) {
         const defFunc = { SetStatus, SetError, Debug_Log };
 
         const getCreds = () => creds.getCredentialsRED({ RED, id: node.login });
-        const updateCreds = newCreds => {
+        const updateCreds = (/** @type {aliceCredsAdd} */ newCreds) => {
             creds.updateCredentialsRED({ RED, id: node.login, newCreds });
             Object.entries(newCreds).forEach(([key, val]) => {
                 Debug_Log(`The value of ${key} has been set to ${val}. Update alice-login manual.`);
@@ -132,7 +132,6 @@ module.exports = function (/** @type {RED} */ RED) {
 
                 if (!is_cookies_set) {
                     cookies = await getCookies({ RED, id: node.login, ...defFunc });
-                    Debug_Log("Куки получены!");
                 }
 
                 if (is(cookies)) {
@@ -144,8 +143,12 @@ module.exports = function (/** @type {RED} */ RED) {
                     /** @type {defFetchGet} */
                     const defFetchGet = { headers: { "Cookie": cookies }, ...defFunc };
                     /** @type {defFetchPost} */
-                    const defFetchPost = defFetchGet;
-                    defFetchPost.headers['x-csrf-token'] = csrf_token;
+                    const defFetchPost = {
+                        headers: {
+                            "Cookie": cookies,
+                            'x-csrf-token': csrf_token
+                        }, ...defFunc
+                    };
 
                     if (!is_speaker_set) {
 

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
         "type": "git",
         "url": "git+https://github.com/AntonTumilovich/https-flows.nodered.org-node-node-red-contrib-yandex-alice-command.git"
     },
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "yandex-alice-command system",
     "main": "yandex-alice-command.js",
     "scripts": {

diff --git a/utils/getCookies.js b/utils/getCookies.js
@@ -5,19 +5,19 @@ const https = require("https");
 const { is, checkStatus, creds } = require("./functions");
 
 /** @type {getCookies} */
-module.exports = async ({ forceCreds, RED, id, SetStatus, SetError }) => {
+module.exports = async ({ forceCreds, RED, id, SetStatus, SetError, Debug_Log }) => {
 
     let topic = "Get cookies";
 
     const getCredentials = () => creds.getCredentialsRED({ RED, id });
-    const updateCredentials = (newCreds) => creds.updateCredentialsRED({ RED, id, newCreds });
+    const updateCredentials = (/** @type {aliceCredsAdd} */ newCreds) => creds.updateCredentialsRED({ RED, id, newCreds });
 
     /** @type {aliceCreds} */
-    let currCreds = forceCreds || getCredentials();
-    let { username, password, cookies } = currCreds;
+    let { username, password } = forceCreds || getCredentials();
+    let cookies = "";
 
     const agent = new https.Agent({ keepAlive: true });
-    const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.74 Safari/537.36";
+    const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36";
 
     SetStatus("blue", "ring", topic, "init");
     let { csrf_token, process_uuid } = await fetch("https://passport.yandex.ru/auth?repath=https://yandex.ru",
@@ -32,7 +32,7 @@ module.exports = async ({ forceCreds, RED, id, SetStatus, SetError }) => {
             let yaheaders = res.headers.raw();
             yaheaders['set-cookie'].forEach(tmp => {
                 let tmp_cookie = tmp.substring(0, tmp.indexOf('; ')) + ";";
-                if (tmp_cookie.length > 8) {
+                if (is(tmp_cookie, 4)) {
                     cookies += tmp_cookie;
                 }
             });
@@ -117,7 +117,7 @@ module.exports = async ({ forceCreds, RED, id, SetStatus, SetError }) => {
                         let headers = password_res.headers.raw();
                         headers['set-cookie'].forEach(tmp => {
                             let tmp_cookie = tmp.substring(0, tmp.indexOf('; ')) + ";";
-                            if (tmp_cookie.length > 4) {
+                            if (is(tmp_cookie, 4)) {
                                 cookies += tmp_cookie;
                             }
                         });
@@ -127,9 +127,9 @@ module.exports = async ({ forceCreds, RED, id, SetStatus, SetError }) => {
                     }
                 })
                 .catch(err => SetError(topic, err));
-            /////////////// GET COOKIES End //////////////
 
             if (is(final_cookies, 200)) {
+                Debug_Log("Куки получены!");
                 SetStatus("blue", "dot", topic, "ok");
                 updateCredentials({ cookies: final_cookies });
                 return final_cookies;

diff --git a/utils/myFetch.js b/utils/myFetch.js
@@ -13,7 +13,7 @@ const general = async ({ color, topic, url, method, headers, body, SetStatus, Se
     return await fetch(url, opt)
         .then(checkStatus)
         .then((/** @type {Response} */ res) => res.json())
-        .then((/** @type {ansGet | ansBase}*/ ans) => {
+        .then((/** @type {ansFetch}*/ ans) => {
             SetStatus(color, "dot", topic, ans.status);
             if (ans.status === "ok") {
                 return ans;