@lumiastream/tapo-cove 3.12.1 → 3.12.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.12.2](https://github.com/lumiastream/rgb/compare/v3.12.1...v3.12.2) (2023-10-26)
+
+### Bug Fixes
+
+-   tapo cookie error ([5aa2093](https://github.com/lumiastream/rgb/commit/5aa20933547b1782bbd27ea321c3c75dfe046992))
+
 ## [3.12.1](https://github.com/lumiastream/rgb/compare/v3.12.0...v3.12.1) (2023-10-26)
 
 ### Bug Fixes

package/dist/index.d.mts

@@ -97,14 +97,13 @@ declare class TapoApi {
         email: string;
         password: string;
     }) => Promise<string>;
-    setup: ({ email, password, devices }: {
-        email: string;
-        password: string;
-        devices: Array<{
-            id: string;
-            host: string;
-        }>;
-    }) => Promise<Map<string, DeviceSession>>;
+    setup: (devices: Array<{
+        id: string;
+        host: string;
+    }>, logger?: any) => Promise<{
+        responses: PromiseSettledResult<void>[];
+        devices: Map<string, DeviceSession>;
+    }>;
     sendState: (config: {
         device: {
             id: string;
@@ -121,7 +120,7 @@ declare class TapoApi {
         power: boolean;
     }) => void;
     private sessionPost;
-    needsNewHandshake(): boolean;
+    needsNewHandshake(devSession: any): boolean;
     private handshake;
     private firstHandshake;
     private secondHandshake;

package/dist/index.d.ts

@@ -97,14 +97,13 @@ declare class TapoApi {
         email: string;
         password: string;
     }) => Promise<string>;
-    setup: ({ email, password, devices }: {
-        email: string;
-        password: string;
-        devices: Array<{
-            id: string;
-            host: string;
-        }>;
-    }) => Promise<Map<string, DeviceSession>>;
+    setup: (devices: Array<{
+        id: string;
+        host: string;
+    }>, logger?: any) => Promise<{
+        responses: PromiseSettledResult<void>[];
+        devices: Map<string, DeviceSession>;
+    }>;
     sendState: (config: {
         device: {
             id: string;
@@ -121,7 +120,7 @@ declare class TapoApi {
         power: boolean;
     }) => void;
     private sessionPost;
-    needsNewHandshake(): boolean;
+    needsNewHandshake(devSession: any): boolean;
     private handshake;
     private firstHandshake;
     private secondHandshake;

package/dist/index.js

@@ -85,8 +85,8 @@ var base64Decode = (data) => {
 // src/shared/helpers.ts
 var throwErrorIfFound = (responseData) => {
   const errorCode = responseData["error_code"];
-  console.debug("[Tapo] errorCode: ", errorCode);
   if (errorCode) {
+    console.debug("[Tapo] errorCode: ", errorCode);
     switch (errorCode) {
       case 0:
         return;
@@ -389,26 +389,27 @@ var _TapoApi = class _TapoApi {
       this._token = response.data.result.token;
       return this._token;
     });
-    this.setup = (_0) => __async(this, [_0], function* ({ email, password, devices }) {
+    this.setup = (devices, logger) => __async(this, null, function* () {
       const promises = devices.map((device) => __async(this, null, function* () {
-        const deviceSession = yield this.handshake(device.host);
+        const deviceSession = yield this.handshake(device.host, void 0, false, logger);
         this._devices.set(device.id, deviceSession);
         return;
       }));
+      let responses = [];
       try {
-        const responses = yield Promise.allSettled(promises);
+        responses = yield Promise.allSettled(promises);
       } catch (err) {
         console.error("tapo setup err: ", err);
       }
-      return this._devices;
+      return { responses, devices: this._devices };
     });
     // Change state using lightstate
     this.sendState = (config) => __async(this, null, function* () {
-      const deviceKey = this._devices.get(config.device.id);
-      if (!deviceKey) {
+      const devSession = this._devices.get(config.device.id);
+      if (!devSession) {
         return Promise.resolve(false);
       }
-      yield this.handshake(deviceKey == null ? void 0 : deviceKey.ip, false);
+      yield this.handshake(devSession == null ? void 0 : devSession.ip, devSession, false);
       let shouldWait = false;
       if (config.fetchConfig && config.fetchConfig.shouldWait) {
         shouldWait = true;
@@ -419,14 +420,14 @@ var _TapoApi = class _TapoApi {
         params: values
         // terminalUUID: uuidv4(),
       });
-      const requestData = this.session.cipher.encrypt(deviceRequest);
-      const response = yield this.sessionPost(deviceKey.ip, "/request", requestData.encrypted, "arraybuffer", this.session.Cookie, {
+      const requestData = devSession.cipher.encrypt(deviceRequest);
+      const response = yield this.sessionPost(devSession.ip, "/request", requestData.encrypted, "arraybuffer", devSession.Cookie, {
         seq: requestData.seq.toString()
       });
       if (response.status !== 200) {
         throw new Error("[KLAP] Request failed");
       }
-      const data = JSON.parse(this.session.cipher.decrypt(response.data));
+      const data = JSON.parse(devSession.cipher.decrypt(response.data));
       return {
         response,
         body: data
@@ -447,112 +448,120 @@ var _TapoApi = class _TapoApi {
   // Helpers
   sessionPost(deviceIp, path, payload, responseType, cookie, params) {
     return __async(this, null, function* () {
+      var _a;
+      const headers = {
+        Accept: "*/*",
+        "Content-Type": "application/octet-stream"
+      };
+      if (cookie) {
+        if ((_a = process == null ? void 0 : process.versions) == null ? void 0 : _a.electron) {
+          headers.BypassCookie = cookie;
+        } else {
+          headers.Cookie = cookie;
+        }
+      }
       return import_axios.default.post(`http://${deviceIp}/app${path}`, payload, {
         responseType,
         params,
-        headers: __spreadValues({
-          Accept: "*/*",
-          "Content-Type": "application/octet-stream"
-        }, cookie && {
-          Cookie: cookie
-        }),
+        headers,
         httpAgent: new import_http.default.Agent({
           keepAlive: false
         })
       });
     });
   }
-  needsNewHandshake() {
-    if (!this.session) {
+  needsNewHandshake(devSession) {
+    if (!devSession) {
       return true;
     }
-    if (!this.session.cipher) {
+    if (!devSession.cipher) {
       return true;
     }
-    if (this.session.IsExpired) {
+    if (devSession.IsExpired) {
       return true;
     }
-    if (!this.session.Cookie) {
+    if (!devSession.Cookie) {
       return true;
     }
     return false;
   }
-  handshake(deviceIp, force = false) {
+  handshake(deviceIp, devSession, force = false, logger) {
     return __async(this, null, function* () {
-      if (!this.needsNewHandshake() && !force) {
+      if (!this.needsNewHandshake(devSession) && !force) {
         return;
       }
-      const { localSeed, remoteSeed, authHash } = yield this.firstHandshake(deviceIp);
-      return yield this.secondHandshake(deviceIp, localSeed, remoteSeed, authHash);
+      const { localSeed, remoteSeed, authHash, deviceSession } = yield this.firstHandshake(deviceIp, void 0, logger);
+      return yield this.secondHandshake(deviceSession, deviceIp, localSeed, remoteSeed, authHash, logger);
     });
   }
-  firstHandshake(deviceIp, seed) {
+  firstHandshake(deviceIp, seed, logger) {
     return __async(this, null, function* () {
       var _a;
       const localSeed = seed ? seed : import_crypto4.default.randomBytes(16);
       const handshake1Result = yield this.sessionPost(deviceIp, "/handshake1", localSeed, "arraybuffer");
+      logger == null ? void 0 : logger.debug("handshake1Result: ", handshake1Result);
       if (handshake1Result.status !== 200) {
         throw new Error("Handshake1 failed");
       }
       if (handshake1Result.headers["content-length"] !== "48") {
         throw new Error("Handshake1 failed due to invalid content length");
       }
-      const cookie = (_a = handshake1Result.headers["set-cookie"]) == null ? void 0 : _a[0];
-      const data = handshake1Result.data;
+      const cookie = handshake1Result.headers["bypass-cookie"] || ((_a = handshake1Result.headers["set-cookie"]) == null ? void 0 : _a[0]);
+      const data = Buffer.from(new Uint8Array(handshake1Result.data));
       const [cookieValue, timeout] = cookie.split(";");
       const timeoutValue = timeout.split("=").pop();
-      this.session = new DeviceSession(timeoutValue, deviceIp, cookieValue);
+      const deviceSession = new DeviceSession(timeoutValue, deviceIp, cookieValue);
       const remoteSeed = data.subarray(0, 16);
       const serverHash = data.subarray(16);
-      console.debug("[KLAP] First handshake decoded successfully:\nRemote Seed:", remoteSeed.toString("hex"), "\nServer Hash:", serverHash.toString("hex"), "\nCookie:", cookieValue);
+      logger == null ? void 0 : logger.debug("[KLAP] First handshake decoded successfully:\nRemote Seed:", remoteSeed.toString("hex"), "\nServer Hash:", serverHash.toString("hex"), "\nCookie:", cookieValue);
       const localHash = this.hashAuth(this._config.rawEmail, this._config.rawPassword);
       const localAuthHash = this.sha256(Buffer.concat([localSeed, remoteSeed, localHash]));
       if (Buffer.compare(localAuthHash, serverHash) === 0) {
-        console.debug("[KLAP] Local auth hash matches server hash");
+        logger == null ? void 0 : logger.debug("[KLAP] Local auth hash matches server hash");
         return {
           localSeed,
           remoteSeed,
-          authHash: localHash
+          authHash: localHash,
+          deviceSession
         };
       }
       const emptyHash = this.sha256(Buffer.concat([localSeed, remoteSeed, this.hashAuth("", "")]));
       if (Buffer.compare(emptyHash, serverHash) === 0) {
-        console.debug("[KLAP] [WARN] Empty auth hash matches server hash");
+        logger == null ? void 0 : logger.debug("[KLAP] [WARN] Empty auth hash matches server hash");
         return {
           localSeed,
           remoteSeed,
-          authHash: emptyHash
+          authHash: emptyHash,
+          deviceSession
         };
       }
       const testHash = this.sha256(Buffer.concat([localSeed, remoteSeed, this.hashAuth(_TapoApi.TP_TEST_USER, _TapoApi.TP_TEST_PASSWORD)]));
       if (Buffer.compare(testHash, serverHash) === 0) {
-        console.debug("[KLAP] [WARN] Test auth hash matches server hash");
+        logger == null ? void 0 : logger.debug("[KLAP] [WARN] Test auth hash matches server hash");
         return {
           localSeed,
           remoteSeed,
-          authHash: testHash
+          authHash: testHash,
+          deviceSession
         };
       }
-      this.session = void 0;
       throw new Error("Failed to verify server hash");
     });
   }
-  secondHandshake(deviceIp, localSeed, remoteSeed, authHash) {
+  secondHandshake(devSession, deviceIp, localSeed, remoteSeed, authHash, logger) {
     return __async(this, null, function* () {
       const localAuthHash = this.sha256(Buffer.concat([remoteSeed, localSeed, authHash]));
       try {
-        const handshake2Result = yield this.sessionPost(deviceIp, "/handshake2", localAuthHash, "text", this.session.Cookie);
+        const handshake2Result = yield this.sessionPost(deviceIp, "/handshake2", localAuthHash, "text", devSession.Cookie);
         if (handshake2Result.status === 200) {
-          console.debug("[KLAP] Second handshake successful");
-          const deviceSession = this.session.completeHandshake(deviceIp, new KlapCipher(localSeed, remoteSeed, authHash));
-          this.session = deviceSession;
+          logger == null ? void 0 : logger.debug("[KLAP] Second handshake successful");
+          const deviceSession = devSession.completeHandshake(deviceIp, new KlapCipher(localSeed, remoteSeed, authHash));
           return deviceSession;
         }
-        console.warn("[KLAP] Second handshake failed", handshake2Result.data);
+        logger.warn("[KLAP] Second handshake failed", handshake2Result.data);
       } catch (e) {
-        console.error("[KLAP] Second handshake failed:", e.response.data || e.message);
+        logger.error("[KLAP] Second handshake failed:", e.response.data || e.message);
       }
-      this.session = void 0;
       return void 0;
     });
   }

package/dist/index.mjs

@@ -53,8 +53,8 @@ var base64Decode = (data) => {
 // src/shared/helpers.ts
 var throwErrorIfFound = (responseData) => {
   const errorCode = responseData["error_code"];
-  console.debug("[Tapo] errorCode: ", errorCode);
   if (errorCode) {
+    console.debug("[Tapo] errorCode: ", errorCode);
     switch (errorCode) {
       case 0:
         return;
@@ -357,26 +357,27 @@ var _TapoApi = class _TapoApi {
       this._token = response.data.result.token;
       return this._token;
     });
-    this.setup = (_0) => __async(this, [_0], function* ({ email, password, devices }) {
+    this.setup = (devices, logger) => __async(this, null, function* () {
       const promises = devices.map((device) => __async(this, null, function* () {
-        const deviceSession = yield this.handshake(device.host);
+        const deviceSession = yield this.handshake(device.host, void 0, false, logger);
         this._devices.set(device.id, deviceSession);
         return;
       }));
+      let responses = [];
       try {
-        const responses = yield Promise.allSettled(promises);
+        responses = yield Promise.allSettled(promises);
       } catch (err) {
         console.error("tapo setup err: ", err);
       }
-      return this._devices;
+      return { responses, devices: this._devices };
     });
     // Change state using lightstate
     this.sendState = (config) => __async(this, null, function* () {
-      const deviceKey = this._devices.get(config.device.id);
-      if (!deviceKey) {
+      const devSession = this._devices.get(config.device.id);
+      if (!devSession) {
         return Promise.resolve(false);
       }
-      yield this.handshake(deviceKey == null ? void 0 : deviceKey.ip, false);
+      yield this.handshake(devSession == null ? void 0 : devSession.ip, devSession, false);
       let shouldWait = false;
       if (config.fetchConfig && config.fetchConfig.shouldWait) {
         shouldWait = true;
@@ -387,14 +388,14 @@ var _TapoApi = class _TapoApi {
         params: values
         // terminalUUID: uuidv4(),
       });
-      const requestData = this.session.cipher.encrypt(deviceRequest);
-      const response = yield this.sessionPost(deviceKey.ip, "/request", requestData.encrypted, "arraybuffer", this.session.Cookie, {
+      const requestData = devSession.cipher.encrypt(deviceRequest);
+      const response = yield this.sessionPost(devSession.ip, "/request", requestData.encrypted, "arraybuffer", devSession.Cookie, {
         seq: requestData.seq.toString()
       });
       if (response.status !== 200) {
         throw new Error("[KLAP] Request failed");
       }
-      const data = JSON.parse(this.session.cipher.decrypt(response.data));
+      const data = JSON.parse(devSession.cipher.decrypt(response.data));
       return {
         response,
         body: data
@@ -415,112 +416,120 @@ var _TapoApi = class _TapoApi {
   // Helpers
   sessionPost(deviceIp, path, payload, responseType, cookie, params) {
     return __async(this, null, function* () {
+      var _a;
+      const headers = {
+        Accept: "*/*",
+        "Content-Type": "application/octet-stream"
+      };
+      if (cookie) {
+        if ((_a = process == null ? void 0 : process.versions) == null ? void 0 : _a.electron) {
+          headers.BypassCookie = cookie;
+        } else {
+          headers.Cookie = cookie;
+        }
+      }
       return axios.post(`http://${deviceIp}/app${path}`, payload, {
         responseType,
         params,
-        headers: __spreadValues({
-          Accept: "*/*",
-          "Content-Type": "application/octet-stream"
-        }, cookie && {
-          Cookie: cookie
-        }),
+        headers,
         httpAgent: new http.Agent({
           keepAlive: false
         })
       });
     });
   }
-  needsNewHandshake() {
-    if (!this.session) {
+  needsNewHandshake(devSession) {
+    if (!devSession) {
       return true;
     }
-    if (!this.session.cipher) {
+    if (!devSession.cipher) {
       return true;
     }
-    if (this.session.IsExpired) {
+    if (devSession.IsExpired) {
       return true;
     }
-    if (!this.session.Cookie) {
+    if (!devSession.Cookie) {
       return true;
     }
     return false;
   }
-  handshake(deviceIp, force = false) {
+  handshake(deviceIp, devSession, force = false, logger) {
     return __async(this, null, function* () {
-      if (!this.needsNewHandshake() && !force) {
+      if (!this.needsNewHandshake(devSession) && !force) {
         return;
       }
-      const { localSeed, remoteSeed, authHash } = yield this.firstHandshake(deviceIp);
-      return yield this.secondHandshake(deviceIp, localSeed, remoteSeed, authHash);
+      const { localSeed, remoteSeed, authHash, deviceSession } = yield this.firstHandshake(deviceIp, void 0, logger);
+      return yield this.secondHandshake(deviceSession, deviceIp, localSeed, remoteSeed, authHash, logger);
     });
   }
-  firstHandshake(deviceIp, seed) {
+  firstHandshake(deviceIp, seed, logger) {
     return __async(this, null, function* () {
       var _a;
       const localSeed = seed ? seed : crypto4.randomBytes(16);
       const handshake1Result = yield this.sessionPost(deviceIp, "/handshake1", localSeed, "arraybuffer");
+      logger == null ? void 0 : logger.debug("handshake1Result: ", handshake1Result);
       if (handshake1Result.status !== 200) {
         throw new Error("Handshake1 failed");
       }
       if (handshake1Result.headers["content-length"] !== "48") {
         throw new Error("Handshake1 failed due to invalid content length");
       }
-      const cookie = (_a = handshake1Result.headers["set-cookie"]) == null ? void 0 : _a[0];
-      const data = handshake1Result.data;
+      const cookie = handshake1Result.headers["bypass-cookie"] || ((_a = handshake1Result.headers["set-cookie"]) == null ? void 0 : _a[0]);
+      const data = Buffer.from(new Uint8Array(handshake1Result.data));
       const [cookieValue, timeout] = cookie.split(";");
       const timeoutValue = timeout.split("=").pop();
-      this.session = new DeviceSession(timeoutValue, deviceIp, cookieValue);
+      const deviceSession = new DeviceSession(timeoutValue, deviceIp, cookieValue);
       const remoteSeed = data.subarray(0, 16);
       const serverHash = data.subarray(16);
-      console.debug("[KLAP] First handshake decoded successfully:\nRemote Seed:", remoteSeed.toString("hex"), "\nServer Hash:", serverHash.toString("hex"), "\nCookie:", cookieValue);
+      logger == null ? void 0 : logger.debug("[KLAP] First handshake decoded successfully:\nRemote Seed:", remoteSeed.toString("hex"), "\nServer Hash:", serverHash.toString("hex"), "\nCookie:", cookieValue);
       const localHash = this.hashAuth(this._config.rawEmail, this._config.rawPassword);
       const localAuthHash = this.sha256(Buffer.concat([localSeed, remoteSeed, localHash]));
       if (Buffer.compare(localAuthHash, serverHash) === 0) {
-        console.debug("[KLAP] Local auth hash matches server hash");
+        logger == null ? void 0 : logger.debug("[KLAP] Local auth hash matches server hash");
         return {
           localSeed,
           remoteSeed,
-          authHash: localHash
+          authHash: localHash,
+          deviceSession
         };
       }
       const emptyHash = this.sha256(Buffer.concat([localSeed, remoteSeed, this.hashAuth("", "")]));
       if (Buffer.compare(emptyHash, serverHash) === 0) {
-        console.debug("[KLAP] [WARN] Empty auth hash matches server hash");
+        logger == null ? void 0 : logger.debug("[KLAP] [WARN] Empty auth hash matches server hash");
         return {
           localSeed,
           remoteSeed,
-          authHash: emptyHash
+          authHash: emptyHash,
+          deviceSession
         };
       }
       const testHash = this.sha256(Buffer.concat([localSeed, remoteSeed, this.hashAuth(_TapoApi.TP_TEST_USER, _TapoApi.TP_TEST_PASSWORD)]));
       if (Buffer.compare(testHash, serverHash) === 0) {
-        console.debug("[KLAP] [WARN] Test auth hash matches server hash");
+        logger == null ? void 0 : logger.debug("[KLAP] [WARN] Test auth hash matches server hash");
         return {
           localSeed,
           remoteSeed,
-          authHash: testHash
+          authHash: testHash,
+          deviceSession
         };
       }
-      this.session = void 0;
       throw new Error("Failed to verify server hash");
     });
   }
-  secondHandshake(deviceIp, localSeed, remoteSeed, authHash) {
+  secondHandshake(devSession, deviceIp, localSeed, remoteSeed, authHash, logger) {
     return __async(this, null, function* () {
       const localAuthHash = this.sha256(Buffer.concat([remoteSeed, localSeed, authHash]));
       try {
-        const handshake2Result = yield this.sessionPost(deviceIp, "/handshake2", localAuthHash, "text", this.session.Cookie);
+        const handshake2Result = yield this.sessionPost(deviceIp, "/handshake2", localAuthHash, "text", devSession.Cookie);
         if (handshake2Result.status === 200) {
-          console.debug("[KLAP] Second handshake successful");
-          const deviceSession = this.session.completeHandshake(deviceIp, new KlapCipher(localSeed, remoteSeed, authHash));
-          this.session = deviceSession;
+          logger == null ? void 0 : logger.debug("[KLAP] Second handshake successful");
+          const deviceSession = devSession.completeHandshake(deviceIp, new KlapCipher(localSeed, remoteSeed, authHash));
           return deviceSession;
         }
-        console.warn("[KLAP] Second handshake failed", handshake2Result.data);
+        logger.warn("[KLAP] Second handshake failed", handshake2Result.data);
       } catch (e) {
-        console.error("[KLAP] Second handshake failed:", e.response.data || e.message);
+        logger.error("[KLAP] Second handshake failed:", e.response.data || e.message);
       }
-      this.session = void 0;
       return void 0;
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumiastream/tapo-cove",
-  "version": "3.12.1",
+  "version": "3.12.2",
   "private": false,
   "license": "GPL",
   "main": "dist/index.js",
@@ -24,5 +24,5 @@
     "tsup": "*",
     "typescript": "*"
   },
-  "gitHead": "8b0ab0a76cd60e2e5b79e6279033c53406c3667f"
+  "gitHead": "50bec9272df26e7211708d21cd0f1de4876885d9"
 }