Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More →
alipay-sdk
Advanced tools
alipay-sdk - npm Package Compare versions
Comparing version 4.4.0 to 4.5.0
@@ -170,2 +170,4 @@ /// <reference types="node" /> | ||
| appAuthToken?: string; | ||
| /** 请求超时时间，默认使用 config.timeout */ | ||
| requestTimeout?: number; | ||
| } | ||
@@ -172,0 +174,0 @@ /** |
@@ -40,3 +40,3 @@ /// <reference types="node" /> | ||
| appCertContent?: string | Buffer; | ||
| /** 应用公钥证书sn */ | ||
| /** 应用公钥证书sn，不需要手动设置，会根据 appCertPath 自动计算出来 */ | ||
| appCertSn?: string; | ||
@@ -47,3 +47,3 @@ /** 支付宝根证书文件路径 */ | ||
| alipayRootCertContent?: string | Buffer; | ||
| /** 支付宝根证书sn */ | ||
| /** 支付宝根证书sn，不需要手动设置，会根据 alipayRootCertPath 自动计算出来 */ | ||
| alipayRootCertSn?: string; | ||
@@ -54,3 +54,3 @@ /** 支付宝公钥证书文件路径 */ | ||
| alipayPublicCertContent?: string | Buffer; | ||
| /** 支付宝公钥证书sn */ | ||
| /** 支付宝公钥证书sn，不需要手动设置，会根据 alipayPublicCertPath 自动计算出来 */ | ||
| alipayCertSn?: string; | ||
@@ -57,0 +57,0 @@ /** AES 密钥，调用 AES 加解密相关接口时需要 */ |
@@ -170,2 +170,4 @@ /// <reference types="node" resolution-mode="require"/> | ||
| appAuthToken?: string; | ||
| /** 请求超时时间，默认使用 config.timeout */ | ||
| requestTimeout?: number; | ||
| } | ||
@@ -172,0 +174,0 @@ /** |
@@ -203,3 +203,3 @@ import { debuglog } from 'node:util'; | ||
| dataType: dataType === 'stream' ? 'stream' : 'text', | ||
| timeout: this.config.timeout, | ||
| timeout: options?.requestTimeout ?? this.config.timeout, | ||
| }; | ||
@@ -286,3 +286,16 @@ if (dataType === 'stream') { | ||
| } | ||
| if (this.config.alipayRootCertSn) { | ||
| requestOptions.headers['alipay-root-cert-sn'] = this.config.alipayRootCertSn; | ||
| } | ||
| // 签名规则 https://opendocs.alipay.com/open-v3/054q58?pathHash=474929ac#%E6%99%AE%E9%80%9A%E8%AF%B7%E6%B1%82 | ||
| // authString 拼接格式： | ||
| // | ||
| // ```txt | ||
| // app_id=${app_id},app_cert_sn=${app_cert_sn},nonce=${nonce},timestamp=${timestamp} | ||
| // ``` | ||
| let authString = `app_id=${this.config.appId}`; | ||
| if (this.config.appCertSn) { | ||
| authString += `,app_cert_sn=${this.config.appCertSn}`; | ||
| } | ||
| authString += `,nonce=${randomUUID()},timestamp=${Date.now()}`; | ||
| // 签名字符串拼接格式： | ||
@@ -297,5 +310,2 @@ // | ||
| // ``` | ||
| // | ||
| // TODO: 需要支持 app_cert_sn | ||
| const authString = `app_id=${this.config.appId},nonce=${randomUUID()},timestamp=${Date.now()}`; | ||
| let signString = `${authString}\n${httpMethod}\n${httpRequestUrl}\n${httpRequestBody}\n`; | ||
@@ -748,2 +758,2 @@ if (options?.appAuthToken) { | ||
| } | ||
| //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"alipay.js","sourceRoot":"","sources":["../../src/alipay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIvC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EACL,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAC5E,UAAU,EAAE,cAAc,EAC1B,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9F,MAAM,CAAC,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAE3C,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;AACrC,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC;IAC3B,OAAO,EAAE,IAAI;CACd,CAAC,CAAC;AAoBH,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,IAAI,CAAU;IACd,OAAO,CAAU;IACjB,kBAAkB,CAAU;IAC5B,eAAe,CAAU;IACzB,KAAK,CAAmC;IAExC,YAAY,OAAe,EAAE,OAAmC;QAC9D,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACrB,OAAO,GAAG,GAAG,OAAO,cAAc,OAAO,CAAC,OAAO,GAAG,CAAC;QACvD,CAAC;QACD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;QAChC,IAAI,CAAC,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,CAAC;QACtD,IAAI,CAAC,eAAe,GAAG,OAAO,EAAE,eAAe,CAAC;QAChD,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;CACF;AAcD,MAAM,CAAN,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,yBAAa,CAAA;IACb,qBAAS,CAAA;IACT,2BAAe,CAAA;AACjB,CAAC,EALW,QAAQ,KAAR,QAAQ,QAKnB;AA2ED;;GAEG;AACH,MAAM,OAAO,SAAS;IACJ,OAAO,GAAG,yBAAyB,CAAC;IAC7C,MAAM,CAA4B;IAEzC;;;OAGG;IACH,YAAY,MAAuB;QACjC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAAC,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAAC,MAAM,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAAC,CAAC;QAEzE,+BAA+B;QAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACtF,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACtE,oCAAoC;QACpC,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAChD,sCAAsC;YACtC,cAAc;YACd,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC;gBAC5E,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,WAAY,EAAE,KAAK,CAAC,CAAC;YAC9C,eAAe;YACf,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,uBAAuB,EAAE,KAAK,CAAC;gBACjG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,oBAAqB,EAAE,KAAK,CAAC,CAAC;YACvD,cAAc;YACd,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC;gBAChG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,kBAAmB,EAAE,IAAI,CAAC,CAAC;YACpD,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,uBAAuB,CAAC;gBACrG,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,oBAAqB,CAAC,CAAC;YACxD,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAChF,CAAC;aAAM,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YAClC,kBAAkB;YAClB,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YAC1B,MAAM;YACN,OAAO,EAAE,uCAAuC;YAChD,QAAQ,EAAE,4BAA4B;YACtC,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,KAAK;SACf,EAAE,aAAa,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAQ,CAAC;IACnD,CAAC;IAED,UAAU;IACF,SAAS,CAAC,GAAW,EAAE,IAAY;QACzC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpD,8CAA8C;QAC9C,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;QAE7C,+CAA+C;QAC/C,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QAED,OAAO,cAAc,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,IAAI,OAAO,CAAC;IAC5E,CAAC;IAED,+BAA+B;IACvB,SAAS,CAAC,GAAW,EAAE,MAA8B;QAE3D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,kBAAkB;QAClB,MAAM,OAAO,GAAG;YACd,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS;YACvC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS;YAC3C,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB;YAC1D,aAAa,EAAE,qBAAqB;YACpC,gBAAgB;SACjB,CAAC;QAEF,MAAM,UAAU,GAA2B,EAAE,CAAC;QAC9C,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,YAAY;gBACZ,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,aAAa;gBACb,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;IACpD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,IAAI,CAAU,UAAsB,EAAE,IAAY,EAAE,OAA2B;QAE1F,OAAO,MAAM,IAAI,CAAC,KAAK,CAAI,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAA0B,CAAC;IACzF,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,UAAU,CAAU,UAAsB,EAAE,IAAY,EAAE,OAA2B;QAChG,OAAO,MAAM,IAAI,CAAC,KAAK,CAAI,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAA6B,CAAC;IAC9F,CAAC;IAED;;;OAGG;IACI,KAAK,CAAA,CAAE,GAAG,CAAC,UAAsB,EAAE,IAAY,EAAE,OAA2B;QACjF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG,SAAS,CAAC,kBAAkB,CAAS,MAAa,EAAE,SAAS,EAAE;YAClF,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YACtC,KAAK,CAAC,oBAAoB,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YAChE,oJAAoJ;YACpJ,eAAe;YACf,gBAAgB;YAChB,EAAE;YACF,eAAe;YACf,4GAA4G;YAC5G,EAAE;YACF,aAAa;YACb,uBAAuB;YACvB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,iBAAiB;gBACjB,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,KAAK,KAAK,CAAC,CAAC;gBAAE,SAAS;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAa,CAAC;YACnD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAExC,IAAI,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC7B,SAAS;gBACT,SAAS;YACX,CAAC;YAED,IAAI,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC7B,IAAI,aAAa,EAAE,CAAC;oBAClB,gBAAgB;oBAChB,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,EAA0B,CAAC;gBACnE,CAAC;gBACD,aAAa,GAAG,KAAK,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,IAAI,KAAK,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC5B,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAA0B,CAAC;gBACpE,WAAW;gBACX,aAAa,GAAG,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAU,UAA8C,EAAE,IAAY,EAAE,OAA2B,EAC1G,WAA8B,MAAM;QACtC,UAAU,GAAG,UAAU,CAAC,WAAW,EAAgB,CAAC;QACpD,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,EAAE,CAAC;QAC3C,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,MAAM,cAAc,GAAmB;YACrC,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;YACnD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;SAC7B,CAAC;QACF,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,sBAAsB;YACtB,cAAc,CAAC,UAAU,GAAG,UAAU,CAAC;QACzC,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,CAAC;QAE1D,cAAc,CAAC,OAAO,GAAG;YACvB,YAAY,EAAE,IAAI,CAAC,OAAO;YAC1B,mBAAmB,EAAE,SAAS;YAC9B,MAAM,EAAE,kBAAkB;SAC3B,CAAC;QACF,IAAI,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBAChC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC3B,cAAc,GAAG,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;QAC9D,CAAC;QACD,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAClD,IAAI,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;gBACnC,MAAM,IAAI,SAAS,CAAC,mCAAmC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;gBAClB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;oBACxB,MAAM,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBAC3C,CAAC;gBACD,6BAA6B;gBAC7B,IAAI,IAAgB,CAAC;gBACrB,IAAI,OAAO,CAAC,IAAI,YAAY,cAAc,EAAE,CAAC;oBAC3C,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;oBACxB,MAAM,cAAc,GAAG,EAAqC,CAAC;oBAC7D,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;wBACvC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;oBACzC,CAAC;oBACD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;wBACjB,gCAAgC;wBAChC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC9C,CAAC;oBACD,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;oBACjD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;oBACxD,uFAAuF;oBACvF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;wBACtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;qBAAM,IAAI,OAAO,CAAC,IAAI,YAAY,gBAAgB,EAAE,CAAC;oBACpD,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;oBACpB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;wBACjB,+BAA+B;wBAC/B,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBAC/C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;oBAC1D,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,SAAS,CAAC,wDAAwD,CAAC,CAAC;gBAChF,CAAC;gBACD,cAAc,CAAC,OAAO,GAAG,IAAW,CAAC;gBACrC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,OAAO;gBACP,IAAI,WAAW,GAAG,kBAAkB,CAAC;gBACrC,eAAe,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpE,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;oBACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;wBAC5B,MAAM,IAAI,SAAS,CAAC,0DAA0D,CAAC,CAAC;oBAClF,CAAC;oBACD,OAAO;oBACP,WAAW,GAAG,YAAY,CAAC;oBAC3B,YAAY;oBACZ,cAAc,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,KAAK,CAAC;oBACzD,cAAc,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,KAAK,CAAC;oBACtD,eAAe,GAAG,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC5E,CAAC;gBACD,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,WAAW,CAAC;gBACrD,cAAc,CAAC,OAAO,GAAG,eAAe,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,yGAAyG;QACzG,aAAa;QACb,EAAE;QACF,SAAS;QACT,kBAAkB;QAClB,kBAAkB;QAClB,sBAAsB;QACtB,uBAAuB;QACvB,oBAAoB;QACpB,MAAM;QACN,EAAE;QACF,yBAAyB;QACzB,MAAM,UAAU,GAAG,UAAU,IAAI,CAAC,MAAM,CAAC,KAAK,UAAU,UAAU,EAAE,cAAc,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAC/F,IAAI,UAAU,GAAG,GAAG,UAAU,KAAK,UAAU,KAAK,cAAc,KAAK,eAAe,IAAI,CAAC;QACzF,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC1B,cAAc,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;YACvE,UAAU,IAAI,GAAG,OAAO,CAAC,YAAY,IAAI,CAAC;QAC5C,CAAC;QACD,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC;aACvC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;aAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,wBAAwB,UAAU,SAAS,SAAS,EAAE,CAAC;QAC7E,KAAK,CAAC,2DAA2D,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAC9F,cAAc,CAAC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;QACrD,KAAK,CAAC,sDAAsD,EAC1D,UAAU,EAAE,GAAG,EAAE,eAAe,EAAE,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACtE,IAAI,YAAqC,CAAC;QAC1C,IAAI,CAAC;YACH,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACnD,KAAK,CAAC,GAAG,CAAC,CAAC;YACX,MAAM,IAAI,kBAAkB,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,EAAE;gBACvE,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;QACL,CAAC;QACD,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAW,IAAI,SAAS,CAAC;QAC/E,KAAK,CAAC,uEAAuE,EAC3E,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzE,qEAAqE;QACrE,IAAI,YAAY,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC/B,IAAI,SAIH,CAAC;YACF,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,mBAAmB;gBACnB,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACtD,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACzC,KAAK,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,IAAI,kBAAkB,CAAC,SAAS,CAAC,OAAO,EAAE;gBAC9C,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,KAAK,EAAE,SAAS,CAAC,KAAK;gBACtB,kBAAkB,EAAE,YAAY,CAAC,MAAM;gBACvC,OAAO;aACR,CAAC,CAAC;QACL,CAAC;QACD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,yBAAyB;YACzB,OAAO;gBACL,MAAM,EAAE,YAAY,CAAC,GAAG;gBACxB,kBAAkB,EAAE,YAAY,CAAC,MAAM;gBACvC,OAAO;aAC2B,CAAC;QACvC,CAAC;QACD,IAAI,gBAAgB,GAAG,YAAY,CAAC,IAAc,CAAC;QACnD,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;YACzB,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5E,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,kBAAkB,CAAC,iCAAiC,EAAE;oBAC9D,IAAI,EAAE,eAAe;oBACrB,eAAe,EAAE,YAAY,CAAC,IAAI;oBAClC,kBAAkB,EAAE,YAAY,CAAC,MAAM;oBACvC,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;YAClC,kBAAkB,EAAE,YAAY,CAAC,MAAM;YACvC,OAAO;SACwB,CAAC;IACpC,CAAC;IAED,OAAO;IACP,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,UAA0B,EAAE;QAC/D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,UAAU,GAAG,EAA4B,CAAC;QAC9C,IAAI,QAAQ,GAAG,EAAwC,CAAC;QACxD,MAAM,SAAS,GAAG,EAA+B,CAAC;QAClD,OAAO,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC5C,oCAAoC;YACpC,MAAM,gBAAgB,GAAG,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;gBACvE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YAC5C,oBAAoB;YACpB,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC;YAC1C,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,mBAAmB;QACnB,UAAU,GAAG,aAAa,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,CAAC,QAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC1C,gBAAgB;YAChB,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,WAAW;YACX,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO;QACP,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAClD,UAAU;QACV,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAQ,EAAE,QAAQ,CAAC,CAAC;QAE1D,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,wDAAwD,EACxE,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAC3B,IAAI,YAAwC,CAAC;QAC7C,IAAI,CAAC;YACH,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACvC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE;gBACvC,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;YAC3C,MAAM,IAAI,kBAAkB,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,EAAE;gBACvE,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE;YACxD,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACI,UAAU,CAAC,MAAc,EAAE,SAAyB;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACjF,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACzC,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,OAAO,CAAC,MAAc,EAAE,SAAyB;QACtD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAYM,WAAW,CAAC,MAAc,EAAE,kBAA2D,EAC5F,SAA8B;QAC9B,MAAM,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;QACtC,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YAC3C,UAAU,GAAG,kBAAkB,CAAC;QAClC,CAAC;aAAM,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YAClD,SAAS,GAAG,kBAAkB,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,UAAU,IAAI,SAAS,EAAE,MAAM,EAAE,CAAC;YACrC,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,KAAK,QAAQ;gBAAE,SAAS;YAC7B,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;IAOM,QAAQ,CAAC,MAAc,EAAE,kBAA2D,EACzF,SAA8B;QAC9B,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,kBAAwC,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,kBAAwC,CAAC,CAAC;IAC5E,CAAC;IAED,6BAA6B;IAC7B,SAAS,CAAC,MAAc,EAAE,SAAyB,EAAE;QACnD,IAAI,UAAU,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAA4B,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC3C,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAe,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,mBAAmB;QACnB,UAAU,GAAG,aAAa,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,2CAA2C;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAClD,UAAU;QACV,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAErE,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,uDAAuD,EACtE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;QAE3C,IAAI,MAAM,CAAC,QAAS,CAAC,SAAS,EAAE,KAAK,KAAK,EAAE,CAAC;YAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC9C,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAChD,OAAO,CAAC;sBACU,GAAG,yBAAyB,QAAQ,SAAS,QAAQ;UACjE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC/D,OAAO,8BAA8B,GAAG,YAAY,KAAK,MAAM,CAAC;QAClE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;;gCAEe,QAAQ;KACnC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;IACC,cAAc,CAAC,QAAgC,EAAE,OAAe,EAAE,QAAwB,EAAE,GAAa;QAC/G,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC;aAChE,GAAG,CAAC,GAAG,CAAC,EAAE;YACT,IAAI,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAE1B,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,EAAE,CAAC;gBAC/D,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;YACD,8CAA8C;YAC9C,uDAAuD;YACvD,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;YAC3B,CAAC;YACD,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,QAAQ,GAAG,YAAY,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAElE,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrG,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,SAAiB,EAAE,WAAmB;QAC/C,UAAU;QACV,IAAI,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;QACnC,wBAAwB;QACxB,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC;QACxD,6BAA6B;QAC7B,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAElD;;;;;;WAMG;QACH,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEzE;;;;;WAKG;QACH,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAElD,kBAAkB;QAClB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAEnD,mBAAmB;QACnB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QACtD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CAAC,IAAI,CACf,MAAc,EACd,SAAyB,EAAE,EAC3B,UAA0B,EAAE;QAE5B,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3C,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACpD,CAAC;YAED;;;eAGG;YACH,MAAM,IAAI,SAAS,CAAC,4DAA4D,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,OAAO;QACP,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACvE,KAAK,CAAC,6CAA6C,EACjD,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAE3B,IAAI,YAAwC,CAAC;QAC7C,IAAI,CAAC;YACH,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACvC,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,UAAU;gBAChB,kBAAkB;gBAClB,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE;oBACP,YAAY,EAAE,IAAI,CAAC,OAAO;oBAC1B,mBAAmB,EAAE,OAAO,CAAC,OAAO,IAAI,eAAe,EAAE;oBACzD,0EAA0E;oBAC1E,oBAAoB;oBACpB,sCAAsC;oBACtC,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;YAC3C,MAAM,IAAI,kBAAkB,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,EAAE;gBACvE,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE;YACxD,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC,CAAC;IACL,CAAC;IAED,uBAAuB,CAAC,MAAc,EAAE,YAAwC,EAAE,OAGjF;QACC,KAAK,CAAC,qDAAqD,EACzD,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,QAAkB,CAAC;QAExD,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,kBAAkB,CAAC,sBAAsB,YAAY,CAAC,MAAM,EAAE,EAAE;gBACxE,OAAO;gBACP,eAAe,EAAE,YAAY,CAAC,IAAI;aACnC,CAAC,CAAC;QACL,CAAC;QAED;;;;;;;;;;;;;;;;;;;WAmBG;QACH,IAAI,cAAmC,CAAC;QACxC,IAAI,CAAC;YACH,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,kBAAkB,CAAC,eAAe,EAAE;gBAC5C,OAAO;gBACP,eAAe,EAAE,YAAY,CAAC,IAAI;gBAClC,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;QACL,CAAC;QAED,MAAM,WAAW,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC;QAC9D,IAAI,IAAI,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC;QACxE,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;gBACzB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7B,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBACN,iCAAiC;oBACjC,SAAS;gBACX,CAAC;YACH,CAAC;YAED,SAAS;YACT,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;gBACvC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzG,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;gBACtB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;YAC3B,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,IAAI,kBAAkB,CAAC,qBAAqB,WAAW,MAAM,EAAE;YACnE,OAAO;YACP,eAAe,EAAE,YAAY,CAAC,IAAI;SACnC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;IACP,iBAAiB,CAAC,eAAuB,EAAE,WAAmB,EAAE,UAAkB,EAAE,OAAe;QACjG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YAChF,gBAAgB;YAChB,OAAO;QACT,CAAC;QAED,iBAAiB;QACjB,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,kBAAkB,CAAC,qBAAqB,EAAE;gBAClD,OAAO;gBACP,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;QAED,yBAAyB;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAClE,kCAAkC;QAClC,MAAM,QAAQ,GAAG,YAAY,CAAC,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9E,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACnF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,kBAAkB,CAAC,sBAAsB,UAAU,uBAAuB,WAAW,GAAG,EAAE;gBAClG,OAAO;gBACP,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,QAAa;QACpC,mEAAmE;QACnE,0DAA0D;QAC1D,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,QAAa,EAAE,GAAa;QACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;QAE9B,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,uDAAuD;QACvD,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC;QACtE,MAAM,QAAQ,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QACjC,UAAU;QACV,OAAO,QAAQ,CAAC,IAAI,CAAC;QAErB;;;;WAIG;QACH,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE9B,sBAAsB;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAE3E,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB;;;;eAIG;YACH,OAAO,QAAQ,CAAC,SAAS,CAAC;YAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"} | ||
| //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"alipay.js","sourceRoot":"","sources":["../../src/alipay.ts"],"names":[],"mappings":"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"} |
@@ -40,3 +40,3 @@ /// <reference types="node" resolution-mode="require"/> | ||
| appCertContent?: string | Buffer; | ||
| /** 应用公钥证书sn */ | ||
| /** 应用公钥证书sn，不需要手动设置，会根据 appCertPath 自动计算出来 */ | ||
| appCertSn?: string; | ||
@@ -47,3 +47,3 @@ /** 支付宝根证书文件路径 */ | ||
| alipayRootCertContent?: string | Buffer; | ||
| /** 支付宝根证书sn */ | ||
| /** 支付宝根证书sn，不需要手动设置，会根据 alipayRootCertPath 自动计算出来 */ | ||
| alipayRootCertSn?: string; | ||
@@ -54,3 +54,3 @@ /** 支付宝公钥证书文件路径 */ | ||
| alipayPublicCertContent?: string | Buffer; | ||
| /** 支付宝公钥证书sn */ | ||
| /** 支付宝公钥证书sn，不需要手动设置，会根据 alipayPublicCertPath 自动计算出来 */ | ||
| alipayCertSn?: string; | ||
@@ -57,0 +57,0 @@ /** AES 密钥，调用 AES 加解密相关接口时需要 */ |
| { | ||
| "name": "alipay-sdk", | ||
| "version": "4.4.0", | ||
| "version": "4.5.0", | ||
| "engines": { | ||
@@ -5,0 +5,0 @@ "node": ">=18.0.0" |
@@ -59,5 +59,5 @@ # Alipay OpenAPI SDK | ||
| // 设置应用私钥 | ||
| privateKey: fs.readFileSync('private-key.pem', 'ascii'), | ||
| privateKey: fs.readFileSync('/path/to/private-key.pem', 'ascii'), | ||
| // 设置支付宝公钥 | ||
| alipayPublicKey: fs.readFileSync('alipay-public-key.pem', 'ascii'), | ||
| alipayPublicKey: fs.readFileSync('/path/to/alipay-public-key.pem', 'ascii'), | ||
| // 密钥类型，请与生成的密钥格式保持一致，参考平台配置一节 | ||
@@ -77,7 +77,7 @@ // keyType: 'PKCS1', | ||
| appId: '2016123456789012', | ||
| privateKey: fs.readFileSync('private-key.pem', 'ascii'), | ||
| privateKey: fs.readFileSync('/path/to/private-key.pem', 'ascii'), | ||
| // 传入支付宝根证书、支付宝公钥证书和应用公钥证书。 | ||
| alipayRootCertPath: path.join(__dirname, 'alipayRootCert.crt'), | ||
| alipayPublicCertPath: path.join(__dirname, 'alipayCertPublicKey_RSA2.crt'), | ||
| appCertPath: path.join(__dirname, 'appCertPublicKey.crt'), | ||
| alipayRootCertPath: '/path/to/alipayRootCert.crt', | ||
| alipayPublicCertPath: '/path/to/alipayCertPublicKey_RSA2.crt', | ||
| appCertPath: '/path/to/appCertPublicKey.crt', | ||
| }); | ||
@@ -393,2 +393,3 @@ ``` | ||
| | options.appAuthToken | `string` | [应用授权令牌](https://opendocs.alipay.com/isv/10467/xldcyq?pathHash=abce531a)，代商家调用支付宝开放接口必填 | 否 | | ||
| | options.requestTimeout | `number` | 请求超时时间，默认使用 `config.timeout` | 否 | | ||
@@ -395,0 +396,0 @@ #### `AlipayCommonResult<T>` |
@@ -157,2 +157,4 @@ import { debuglog } from 'node:util'; | ||
| appAuthToken?: string; | ||
| /** 请求超时时间，默认使用 config.timeout */ | ||
| requestTimeout?: number; | ||
| } | ||
@@ -328,3 +330,3 @@ | ||
| dataType: dataType === 'stream' ? 'stream' : 'text', | ||
| timeout: this.config.timeout, | ||
| timeout: options?.requestTimeout ?? this.config.timeout, | ||
| }; | ||
@@ -408,3 +410,16 @@ if (dataType === 'stream') { | ||
| } | ||
| if (this.config.alipayRootCertSn) { | ||
| requestOptions.headers['alipay-root-cert-sn'] = this.config.alipayRootCertSn; | ||
| } | ||
| // 签名规则 https://opendocs.alipay.com/open-v3/054q58?pathHash=474929ac#%E6%99%AE%E9%80%9A%E8%AF%B7%E6%B1%82 | ||
| // authString 拼接格式： | ||
| // | ||
| // ```txt | ||
| // app_id=${app_id},app_cert_sn=${app_cert_sn},nonce=${nonce},timestamp=${timestamp} | ||
| // ``` | ||
| let authString = `app_id=${this.config.appId}`; | ||
| if (this.config.appCertSn) { | ||
| authString += `,app_cert_sn=${this.config.appCertSn}`; | ||
| } | ||
| authString += `,nonce=${randomUUID()},timestamp=${Date.now()}`; | ||
| // 签名字符串拼接格式： | ||
@@ -419,5 +434,2 @@ // | ||
| // ``` | ||
| // | ||
| // TODO: 需要支持 app_cert_sn | ||
| const authString = `app_id=${this.config.appId},nonce=${randomUUID()},timestamp=${Date.now()}`; | ||
| let signString = `${authString}\n${httpMethod}\n${httpRequestUrl}\n${httpRequestBody}\n`; | ||
@@ -424,0 +436,0 @@ if (options?.appAuthToken) { |
@@ -39,3 +39,3 @@ /** | ||
| appCertContent?: string | Buffer; | ||
| /** 应用公钥证书sn */ | ||
| /** 应用公钥证书sn，不需要手动设置，会根据 appCertPath 自动计算出来 */ | ||
| appCertSn?: string; | ||
@@ -46,3 +46,3 @@ /** 支付宝根证书文件路径 */ | ||
| alipayRootCertContent?: string | Buffer; | ||
| /** 支付宝根证书sn */ | ||
| /** 支付宝根证书sn，不需要手动设置，会根据 alipayRootCertPath 自动计算出来 */ | ||
| alipayRootCertSn?: string; | ||
@@ -53,3 +53,3 @@ /** 支付宝公钥证书文件路径 */ | ||
| alipayPublicCertContent?: string | Buffer; | ||
| /** 支付宝公钥证书sn */ | ||
| /** 支付宝公钥证书sn，不需要手动设置，会根据 alipayPublicCertPath 自动计算出来 */ | ||
| alipayCertSn?: string; | ||
@@ -56,0 +56,0 @@ /** AES 密钥，调用 AES 加解密相关接口时需要 */ |
Sorry, the diff of this file is too big to display
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
- increased by1.11%
283649
- Lines of code
- increased by0.86%
4206
- Number of lines in readme file
- increased by0.2%
497
Worsened metrics
- Number of downloads
- decreased by-17.47%
2428
No dependency changes