@tuya-sat/micro-dev-proxy 3.0.2 → 3.0.4

package/dist/appProxy.d.ts

@@ -1,5 +1,5 @@
-import Token from "./token";
-import { Options } from "http-proxy-middleware";
+import Token from './token';
+import { Options } from 'http-proxy-middleware';
 export interface AppProxyConfig {
     target: string;
     username: string;
@@ -11,6 +11,7 @@ export interface AppProxyConfig {
     };
     isMainApp?: boolean;
     logSign?: boolean;
+    isThirdLogin?: boolean;
 }
 export default class AppProxy {
     target: string;
@@ -28,11 +29,12 @@ export default class AppProxy {
     loginCookie: Token;
     csrfCookie: Token;
     csrfValue: Token;
-    constructor({ target, username, password, additionHeaders, isMainApp, loginApi, csrf, logSign, }: AppProxyConfig);
+    isThirdLogin?: boolean;
+    constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf, logSign, }: AppProxyConfig);
     init(): Promise<void>;
     getCsrf(): Promise<void>;
     getLoginCookie(): Promise<void>;
-    processReq(proxyReq: Parameters<Options["onProxyReq"]>[0]): void;
+    processReq(proxyReq: Parameters<Options['onProxyReq']>[0]): void;
     combinedHeader(prevHeadar: any): any;
     processRes(responseBuffer: any): Promise<any>;
 }

package/dist/appProxy.js

@@ -43,18 +43,21 @@ const token_1 = __importDefault(require("./token"));
 const util_1 = require("./util");
 const url_1 = require("url");
 class AppProxy {
-    constructor({ target, username, password, additionHeaders, isMainApp, loginApi, csrf = true, logSign, }) {
+    constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf = true, logSign, }) {
         this.loginCookie = new token_1.default();
         this.csrfCookie = new token_1.default();
         this.csrfValue = new token_1.default();
         this.target = target;
-        this.username = username;
-        this.password = (0, js_sha256_1.sha256)(password);
+        if (!isMainApp) {
+            this.username = username;
+            this.password = (0, js_sha256_1.sha256)(password);
+        }
         this.isMainApp = isMainApp;
         this.loginApi = loginApi;
         this.additionHeaders = additionHeaders;
         this.log = (0, util_1.logFactory)(logSign);
         this.csrf = csrf;
+        this.isThirdLogin = isThirdLogin;
         Object.assign(globalAxios_1.default.defaults.headers.common, this.additionHeaders);
     }
     init() {
@@ -68,13 +71,13 @@ class AppProxy {
     //获取csrf
     getCsrf() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield (0, csrf_1.default)(new url_1.URL("/login", this.target).href)
+            yield (0, csrf_1.default)(new url_1.URL('/login?disable_third_login=true', this.target).href)
                 .then(([cookie, value]) => {
                 this.csrfCookie.setValue(cookie);
                 this.csrfValue.setValue(value);
             })
                 .catch((err) => {
-                this.log("----get csrf error----" + err);
+                this.log('----get csrf error----' + err);
                 return Promise.reject(err);
             });
         });
@@ -90,7 +93,7 @@ class AppProxy {
                 this.loginCookie.setValue(cookie);
             })
                 .catch((err) => {
-                this.log("----inital login error----" + err);
+                this.log('----inital login error----' + err);
                 return Promise.reject(err);
             });
         });
@@ -99,11 +102,11 @@ class AppProxy {
         //整合需要添加的header头
         const combineHeaders = this.combinedHeader(this.additionHeaders);
         Object.entries(combineHeaders).forEach(([headerKey, value]) => proxyReq.setHeader(headerKey, value));
-        const prevCookie = proxyReq.getHeader("cookie") || "";
+        const prevCookie = proxyReq.getHeader('cookie') || '';
         const cookie = [
             ...prevCookie
-                .split(";")
-                .map((item) => [item.split("=")[0].trim(), item])
+                .split(';')
+                .map((item) => [item.split('=')[0].trim(), item])
                 //过滤字符
                 .filter(([key]) => {
                 if (csrf_1.COOKIE_CSRF === key) {
@@ -119,9 +122,9 @@ class AppProxy {
             this.loginCookie.value,
         ]
             .filter(Boolean)
-            .join(";");
-        proxyReq.setHeader("cookie", cookie);
-        this.log("----req-header----", proxyReq.getHeaders());
+            .join(';');
+        proxyReq.setHeader('cookie', cookie);
+        this.log('----req-header----', proxyReq.getHeaders());
     }
     combinedHeader(prevHeadar) {
         let proccessedHeader = Object.assign({}, prevHeadar);
@@ -132,22 +135,22 @@ class AppProxy {
         return __awaiter(this, void 0, void 0, function* () {
             let response;
             try {
-                response = JSON.parse(responseBuffer.toString("utf8"));
+                response = JSON.parse(responseBuffer.toString('utf8'));
             }
             catch (err) {
-                this.log("----json parse responseBuffer string error-----", err);
+                this.log('----json parse responseBuffer string error-----', err);
                 return responseBuffer;
             }
             if (response.code === 1010 && !this.isMainApp) {
-                let modifyText = "";
+                let modifyText = '';
                 yield this.getLoginCookie()
                     .then((res) => {
-                    modifyText = "proxyInfo:cookie刷新成功，请刷新浏览器";
-                    this.log("----refresh success----");
+                    modifyText = 'proxyInfo:cookie刷新成功，请刷新浏览器';
+                    this.log('----refresh success----');
                 })
                     .catch((err) => {
-                    modifyText = "proxyInfo:cookie刷新失败，只能重新启动应用啦";
-                    this.log("----refresh failure----", err);
+                    modifyText = 'proxyInfo:cookie刷新失败，只能重新启动应用啦';
+                    this.log('----refresh failure----', err);
                 });
                 const data = Object.assign(Object.assign({}, response), { msg: (response === null || response === void 0 ? void 0 : response.msg) ? `${response === null || response === void 0 ? void 0 : response.msg}----${modifyText}` : modifyText });
                 return JSON.stringify(data);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AppProxyConfig } from "./appProxy";
+import { AppProxyConfig } from './appProxy';
 export interface Config extends AppProxyConfig {
     needProxyApi?: {
         [key: string]: any;

package/dist/index.js

@@ -29,7 +29,7 @@ function awaiting() {
 exports.awaiting = awaiting;
 function createProxy(_a) {
     var { additionHeaders = {} } = _a, restPrevConfig = __rest(_a, ["additionHeaders"]);
-    const config = Object.assign({ additionHeaders: Object.assign({ terminalId: os_1.default.hostname() }, additionHeaders), isMainApp: false, loginApi: "/api/login", needProxyApi: ["/api", "/open-api", "/custom-api"], logSign: false, csrf: true }, restPrevConfig);
+    const config = Object.assign({ additionHeaders: Object.assign({ terminalId: os_1.default.hostname() }, additionHeaders), isMainApp: restPrevConfig.isMainApp, loginApi: '/api/login', needProxyApi: ['/api', '/open-api', '/custom-api'], logSign: false, csrf: true }, restPrevConfig);
     const { needProxyApi } = config, appProxyConfig = __rest(config, ["needProxyApi"]);
     const appProxy = new appProxy_1.default(appProxyConfig);
     return function middleware(app) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-dev-proxy",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {