diff --git a/__tests__/it/integration_test.ts b/__tests__/it/integration_test.ts index 9ff3ef11..8a223307 100644 --- a/__tests__/it/integration_test.ts +++ b/__tests__/it/integration_test.ts @@ -92,6 +92,7 @@ describe('Integration Tests', () => { provisionConfig: undefined, triggers: undefined, vpcBinding: undefined, + disableOndemand: false, }); }, 60000); @@ -125,6 +126,7 @@ describe('Integration Tests', () => { role: '', runtime: 'python3.9', timeout: 60, + disableOndemand: false, triggers: [ { description: 'xxxx', diff --git a/package-lock.json b/package-lock.json index a2e343c3..43f165b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "ISC", "dependencies": { "@alicloud/fc2": "^2.6.6", - "@alicloud/fc20230330": "4.1.6-beta.2", + "@alicloud/fc20230330": "4.3.2", "@alicloud/pop-core": "^1.8.0", "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21", "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9", @@ -22,6 +22,7 @@ "@serverless-devs/utils": "^0.0.16", "@serverless-devs/zip": "^0.0.3-beta.8", "ajv": "^8.17.1", + "ali-oss": "6.18.1", "aliyun-sdk": "^1.12.10", "chalk": "^4.1.0", "crc64-ecma182.js": "^2.0.2", @@ -200,16 +201,12 @@ } }, "node_modules/@alicloud/fc20230330": { - "version": "4.1.6-beta.2", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/@alicloud/fc20230330/-/@alicloud/fc20230330-4.1.6-beta.2.tgz", - "integrity": "sha512-7/0Ii8EbCTYRjCKuaJxnGJYx1IFQBFA/cwrqsJ6hcCm7iYaafnBWzKJKPw1KrNXFS7GSu+95GKYd5txHK3e8Ew==", - "license": "Apache-2.0", + "version": "4.3.2", + "resolved": "https://registry.npmmirror.com/@alicloud/fc20230330/-/fc20230330-4.3.2.tgz", + "integrity": "sha512-svXf6mbNgLtvCRHM/Z2P8VJXZGoQhyWoosYmFeasMBeNRDaPgGzYOpmY6FedL/4nzSn6Z6gV5DQT4EGz/AKq4Q==", "dependencies": { - "@alicloud/endpoint-util": "^0.0.1", - "@alicloud/openapi-client": "^0.4.12", - "@alicloud/openapi-util": "^0.3.2", - "@alicloud/tea-typescript": "^1.7.1", - "@alicloud/tea-util": "^1.4.9" + "@alicloud/openapi-core": "^1.0.0", + "@darabonba/typescript": "^1.0.0" } }, "node_modules/@alicloud/gateway-pop": { @@ -3578,10 +3575,9 @@ } }, "node_modules/ali-oss": { - "version": "6.22.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/ali-oss/-/ali-oss-6.22.0.tgz", - "integrity": "sha512-X8CHo+wsjCBvDaEvuibFOi3SZxiCBZSRUURrXH0upoVwu3SuW3e+PTVK7xw+uN6EyTcAESqrngrQimhp8iBzsQ==", - "license": "MIT", + "version": "6.18.1", + "resolved": "https://registry.npmmirror.com/ali-oss/-/ali-oss-6.18.1.tgz", + "integrity": "sha512-VsptD0jX3JNc3AjiLs5a9oTP0ArfT9IYhBuY6G/SpuY6LMuiwfqywrAosY65BlHKODAdYy8VWL6kmt0mO7BUGA==", "dependencies": { "address": "^1.2.2", "agentkeepalive": "^3.4.1", @@ -3596,16 +3592,14 @@ "is-type-of": "^1.4.0", "js-base64": "^2.5.2", "jstoxml": "^2.0.0", - "lodash": "^4.17.21", "merge-descriptors": "^1.0.1", "mime": "^2.4.5", "platform": "^1.3.1", "pump": "^3.0.0", - "qs": "^6.4.0", "sdk-base": "^2.0.1", "stream-http": "2.8.2", "stream-wormhole": "^1.0.4", - "urllib": "^2.44.0", + "urllib": "2.41.0", "utility": "^1.18.0", "xml2js": "^0.6.2" }, @@ -3739,9 +3733,8 @@ }, "node_modules/any-promise": { "version": "1.3.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "license": "MIT" + "resolved": "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" }, "node_modules/anymatch": { "version": "3.1.3", @@ -4980,9 +4973,8 @@ }, "node_modules/content-type": { "version": "1.0.5", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/content-type/-/content-type-1.0.5.tgz", + "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -5046,9 +5038,8 @@ }, "node_modules/copy-to": { "version": "2.0.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/copy-to/-/copy-to-2.0.1.tgz", - "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==", - "license": "MIT" + "resolved": "https://registry.npmmirror.com/copy-to/-/copy-to-2.0.1.tgz", + "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==" }, "node_modules/core-js": { "version": "2.6.12", @@ -5548,9 +5539,8 @@ }, "node_modules/default-user-agent": { "version": "1.0.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/default-user-agent/-/default-user-agent-1.0.0.tgz", + "resolved": "https://registry.npmmirror.com/default-user-agent/-/default-user-agent-1.0.0.tgz", "integrity": "sha512-bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw==", - "license": "MIT", "dependencies": { "os-name": "~1.0.3" }, @@ -5639,9 +5629,8 @@ }, "node_modules/destroy": { "version": "1.2.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/destroy/-/destroy-1.2.0.tgz", + "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -5679,9 +5668,8 @@ }, "node_modules/digest-header": { "version": "1.1.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/digest-header/-/digest-header-1.1.0.tgz", + "resolved": "https://registry.npmmirror.com/digest-header/-/digest-header-1.1.0.tgz", "integrity": "sha512-glXVh42vz40yZb9Cq2oMOt70FIoWiv+vxNvdKdU8CwjLad25qHM3trLxhl9bVjdr6WaslIXhWpn0NO8T/67Qjg==", - "license": "MIT", "engines": { "node": ">= 8.0.0" } @@ -5793,9 +5781,8 @@ }, "node_modules/ee-first": { "version": "1.1.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "license": "MIT" + "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/egg-errors": { "version": "2.3.2", @@ -7747,9 +7734,8 @@ }, "node_modules/formstream": { "version": "1.5.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/formstream/-/formstream-1.5.1.tgz", + "resolved": "https://registry.npmmirror.com/formstream/-/formstream-1.5.1.tgz", "integrity": "sha512-q7ORzFqotpwn3Y/GBK2lK7PjtZZwJHz9QE9Phv8zb5IrL9ftGLyi2zjGURON3voK8TaZ+mqJKERYN4lrHYTkUQ==", - "license": "MIT", "dependencies": { "destroy": "^1.0.4", "mime": "^2.5.2", @@ -8767,6 +8753,7 @@ "version": "0.6.3", "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -11284,9 +11271,8 @@ }, "node_modules/mime": { "version": "2.6.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/mime/-/mime-2.6.0.tgz", + "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz", "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "license": "MIT", "bin": { "mime": "cli.js" }, @@ -11384,9 +11370,8 @@ }, "node_modules/mkdirp": { "version": "0.5.6", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/mkdirp/-/mkdirp-0.5.6.tgz", + "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "license": "MIT", "dependencies": { "minimist": "^1.2.6" }, @@ -11429,9 +11414,8 @@ }, "node_modules/mz": { "version": "2.7.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/mz/-/mz-2.7.0.tgz", + "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "license": "MIT", "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", @@ -11476,9 +11460,8 @@ }, "node_modules/node-hex": { "version": "1.0.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/node-hex/-/node-hex-1.0.1.tgz", + "resolved": "https://registry.npmmirror.com/node-hex/-/node-hex-1.0.1.tgz", "integrity": "sha512-iwpZdvW6Umz12ICmu9IYPRxg0tOLGmU3Tq2tKetejCj3oZd7b2nUXwP3a7QA5M9glWy8wlPS1G3RwM/CdsUbdQ==", - "license": "MIT", "engines": { "node": ">=8.0.0" } @@ -11772,9 +11755,8 @@ }, "node_modules/os-name": { "version": "1.0.3", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/os-name/-/os-name-1.0.3.tgz", + "resolved": "https://registry.npmmirror.com/os-name/-/os-name-1.0.3.tgz", "integrity": "sha512-f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew==", - "license": "MIT", "dependencies": { "osx-release": "^1.0.0", "win-release": "^1.0.0" @@ -11797,9 +11779,8 @@ }, "node_modules/osx-release": { "version": "1.1.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/osx-release/-/osx-release-1.1.0.tgz", + "resolved": "https://registry.npmmirror.com/osx-release/-/osx-release-1.1.0.tgz", "integrity": "sha512-ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A==", - "license": "MIT", "dependencies": { "minimist": "^1.1.0" }, @@ -12083,12 +12064,8 @@ }, "node_modules/pause-stream": { "version": "0.0.11", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/pause-stream/-/pause-stream-0.0.11.tgz", + "resolved": "https://registry.npmmirror.com/pause-stream/-/pause-stream-0.0.11.tgz", "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==", - "license": [ - "MIT", - "Apache2" - ], "dependencies": { "through": "~2.3" } @@ -12662,9 +12639,8 @@ }, "node_modules/qs": { "version": "6.14.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/qs/-/qs-6.14.0.tgz", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz", "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", - "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" }, @@ -13697,9 +13673,8 @@ }, "node_modules/statuses": { "version": "1.5.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/statuses/-/statuses-1.5.0.tgz", + "resolved": "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz", "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -14369,18 +14344,16 @@ }, "node_modules/thenify": { "version": "3.3.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/thenify/-/thenify-3.3.1.tgz", + "resolved": "https://registry.npmmirror.com/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "license": "MIT", "dependencies": { "any-promise": "^1.0.0" } }, "node_modules/thenify-all": { "version": "1.6.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/thenify-all/-/thenify-all-1.6.0.tgz", + "resolved": "https://registry.npmmirror.com/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", - "license": "MIT", "dependencies": { "thenify": ">= 3.1.0 < 4" }, @@ -15234,19 +15207,20 @@ } }, "node_modules/urllib": { - "version": "2.44.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/urllib/-/urllib-2.44.0.tgz", - "integrity": "sha512-zRCJqdfYllRDA9bXUtx+vccyRqtJPKsw85f44zH7zPD28PIvjMqIgw9VwoTLV7xTBWZsbebUFVHU5ghQcWku2A==", - "license": "MIT", + "version": "2.41.0", + "resolved": "https://registry.npmmirror.com/urllib/-/urllib-2.41.0.tgz", + "integrity": "sha512-pNXdxEv52L67jahLT+/7QE+Fup1y2Gc6EdmrAhQ6OpQIC2rl14oWwv9hvk1GXOZqEnJNwRXHABuwgPOs1CtL7g==", "dependencies": { "any-promise": "^1.3.0", "content-type": "^1.0.2", + "debug": "^2.6.9", "default-user-agent": "^1.0.0", "digest-header": "^1.0.0", "ee-first": "~1.1.1", "formstream": "^1.1.0", "humanize-ms": "^1.2.0", - "iconv-lite": "^0.6.3", + "iconv-lite": "^0.4.15", + "ip": "^1.1.5", "pump": "^3.0.0", "qs": "^6.4.0", "statuses": "^1.3.1", @@ -15264,6 +15238,17 @@ } } }, + "node_modules/urllib/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -15272,9 +15257,8 @@ }, "node_modules/utility": { "version": "1.18.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/utility/-/utility-1.18.0.tgz", + "resolved": "https://registry.npmmirror.com/utility/-/utility-1.18.0.tgz", "integrity": "sha512-PYxZDA+6QtvRvm//++aGdmKG/cI07jNwbROz0Ql+VzFV1+Z0Dy55NI4zZ7RHc9KKpBePNFwoErqIuqQv/cjiTA==", - "license": "MIT", "dependencies": { "copy-to": "^2.0.1", "escape-html": "^1.0.3", @@ -15618,9 +15602,8 @@ }, "node_modules/win-release": { "version": "1.1.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/win-release/-/win-release-1.1.1.tgz", + "resolved": "https://registry.npmmirror.com/win-release/-/win-release-1.1.1.tgz", "integrity": "sha512-iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw==", - "license": "MIT", "dependencies": { "semver": "^5.0.1" }, @@ -15630,9 +15613,8 @@ }, "node_modules/win-release/node_modules/semver": { "version": "5.7.2", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/semver/-/semver-5.7.2.tgz", + "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "license": "ISC", "bin": { "semver": "bin/semver" } @@ -16085,15 +16067,12 @@ } }, "@alicloud/fc20230330": { - "version": "4.1.6-beta.2", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/@alicloud/fc20230330/-/@alicloud/fc20230330-4.1.6-beta.2.tgz", - "integrity": "sha512-7/0Ii8EbCTYRjCKuaJxnGJYx1IFQBFA/cwrqsJ6hcCm7iYaafnBWzKJKPw1KrNXFS7GSu+95GKYd5txHK3e8Ew==", + "version": "4.3.2", + "resolved": "https://registry.npmmirror.com/@alicloud/fc20230330/-/fc20230330-4.3.2.tgz", + "integrity": "sha512-svXf6mbNgLtvCRHM/Z2P8VJXZGoQhyWoosYmFeasMBeNRDaPgGzYOpmY6FedL/4nzSn6Z6gV5DQT4EGz/AKq4Q==", "requires": { - "@alicloud/endpoint-util": "^0.0.1", - "@alicloud/openapi-client": "^0.4.12", - "@alicloud/openapi-util": "^0.3.2", - "@alicloud/tea-typescript": "^1.7.1", - "@alicloud/tea-util": "^1.4.9" + "@alicloud/openapi-core": "^1.0.0", + "@darabonba/typescript": "^1.0.0" } }, "@alicloud/gateway-pop": { @@ -18596,9 +18575,9 @@ } }, "ali-oss": { - "version": "6.22.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/ali-oss/-/ali-oss-6.22.0.tgz", - "integrity": "sha512-X8CHo+wsjCBvDaEvuibFOi3SZxiCBZSRUURrXH0upoVwu3SuW3e+PTVK7xw+uN6EyTcAESqrngrQimhp8iBzsQ==", + "version": "6.18.1", + "resolved": "https://registry.npmmirror.com/ali-oss/-/ali-oss-6.18.1.tgz", + "integrity": "sha512-VsptD0jX3JNc3AjiLs5a9oTP0ArfT9IYhBuY6G/SpuY6LMuiwfqywrAosY65BlHKODAdYy8VWL6kmt0mO7BUGA==", "requires": { "address": "^1.2.2", "agentkeepalive": "^3.4.1", @@ -18613,16 +18592,14 @@ "is-type-of": "^1.4.0", "js-base64": "^2.5.2", "jstoxml": "^2.0.0", - "lodash": "^4.17.21", "merge-descriptors": "^1.0.1", "mime": "^2.4.5", "platform": "^1.3.1", "pump": "^3.0.0", - "qs": "^6.4.0", "sdk-base": "^2.0.1", "stream-http": "2.8.2", "stream-wormhole": "^1.0.4", - "urllib": "^2.44.0", + "urllib": "2.41.0", "utility": "^1.18.0", "xml2js": "^0.6.2" }, @@ -18713,7 +18690,7 @@ }, "any-promise": { "version": "1.3.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/any-promise/-/any-promise-1.3.0.tgz", + "resolved": "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" }, "anymatch": { @@ -19558,7 +19535,7 @@ }, "content-type": { "version": "1.0.5", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/content-type/-/content-type-1.0.5.tgz", + "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" }, "conventional-changelog-angular": { @@ -19604,7 +19581,7 @@ }, "copy-to": { "version": "2.0.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/copy-to/-/copy-to-2.0.1.tgz", + "resolved": "https://registry.npmmirror.com/copy-to/-/copy-to-2.0.1.tgz", "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==" }, "core-js": { @@ -19963,7 +19940,7 @@ }, "default-user-agent": { "version": "1.0.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/default-user-agent/-/default-user-agent-1.0.0.tgz", + "resolved": "https://registry.npmmirror.com/default-user-agent/-/default-user-agent-1.0.0.tgz", "integrity": "sha512-bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw==", "requires": { "os-name": "~1.0.3" @@ -20023,7 +20000,7 @@ }, "destroy": { "version": "1.2.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/destroy/-/destroy-1.2.0.tgz", + "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, "detect-newline": { @@ -20046,7 +20023,7 @@ }, "digest-header": { "version": "1.1.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/digest-header/-/digest-header-1.1.0.tgz", + "resolved": "https://registry.npmmirror.com/digest-header/-/digest-header-1.1.0.tgz", "integrity": "sha512-glXVh42vz40yZb9Cq2oMOt70FIoWiv+vxNvdKdU8CwjLad25qHM3trLxhl9bVjdr6WaslIXhWpn0NO8T/67Qjg==" }, "dir-glob": { @@ -20131,7 +20108,7 @@ }, "ee-first": { "version": "1.1.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/ee-first/-/ee-first-1.1.1.tgz", + "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "egg-errors": { @@ -21541,7 +21518,7 @@ }, "formstream": { "version": "1.5.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/formstream/-/formstream-1.5.1.tgz", + "resolved": "https://registry.npmmirror.com/formstream/-/formstream-1.5.1.tgz", "integrity": "sha512-q7ORzFqotpwn3Y/GBK2lK7PjtZZwJHz9QE9Phv8zb5IrL9ftGLyi2zjGURON3voK8TaZ+mqJKERYN4lrHYTkUQ==", "requires": { "destroy": "^1.0.4", @@ -22241,6 +22218,7 @@ "version": "0.6.3", "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3.0.0" } @@ -23969,7 +23947,7 @@ }, "mime": { "version": "2.6.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/mime/-/mime-2.6.0.tgz", + "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz", "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==" }, "mime-db": { @@ -24027,7 +24005,7 @@ }, "mkdirp": { "version": "0.5.6", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/mkdirp/-/mkdirp-0.5.6.tgz", + "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "requires": { "minimist": "^1.2.6" @@ -24058,7 +24036,7 @@ }, "mz": { "version": "2.7.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/mz/-/mz-2.7.0.tgz", + "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", "requires": { "any-promise": "^1.0.0", @@ -24100,7 +24078,7 @@ }, "node-hex": { "version": "1.0.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/node-hex/-/node-hex-1.0.1.tgz", + "resolved": "https://registry.npmmirror.com/node-hex/-/node-hex-1.0.1.tgz", "integrity": "sha512-iwpZdvW6Umz12ICmu9IYPRxg0tOLGmU3Tq2tKetejCj3oZd7b2nUXwP3a7QA5M9glWy8wlPS1G3RwM/CdsUbdQ==" }, "node-int64": { @@ -24298,7 +24276,7 @@ }, "os-name": { "version": "1.0.3", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/os-name/-/os-name-1.0.3.tgz", + "resolved": "https://registry.npmmirror.com/os-name/-/os-name-1.0.3.tgz", "integrity": "sha512-f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew==", "requires": { "osx-release": "^1.0.0", @@ -24312,7 +24290,7 @@ }, "osx-release": { "version": "1.1.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/osx-release/-/osx-release-1.1.0.tgz", + "resolved": "https://registry.npmmirror.com/osx-release/-/osx-release-1.1.0.tgz", "integrity": "sha512-ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A==", "requires": { "minimist": "^1.1.0" @@ -24492,7 +24470,7 @@ }, "pause-stream": { "version": "0.0.11", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/pause-stream/-/pause-stream-0.0.11.tgz", + "resolved": "https://registry.npmmirror.com/pause-stream/-/pause-stream-0.0.11.tgz", "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==", "requires": { "through": "~2.3" @@ -24894,7 +24872,7 @@ }, "qs": { "version": "6.14.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/qs/-/qs-6.14.0.tgz", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz", "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", "requires": { "side-channel": "^1.1.0" @@ -25576,7 +25554,7 @@ }, "statuses": { "version": "1.5.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/statuses/-/statuses-1.5.0.tgz", + "resolved": "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz", "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==" }, "stream-http": { @@ -26072,7 +26050,7 @@ }, "thenify": { "version": "3.3.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/thenify/-/thenify-3.3.1.tgz", + "resolved": "https://registry.npmmirror.com/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", "requires": { "any-promise": "^1.0.0" @@ -26080,7 +26058,7 @@ }, "thenify-all": { "version": "1.6.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/thenify-all/-/thenify-all-1.6.0.tgz", + "resolved": "https://registry.npmmirror.com/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", "requires": { "thenify": ">= 3.1.0 < 4" @@ -26626,22 +26604,34 @@ } }, "urllib": { - "version": "2.44.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/urllib/-/urllib-2.44.0.tgz", - "integrity": "sha512-zRCJqdfYllRDA9bXUtx+vccyRqtJPKsw85f44zH7zPD28PIvjMqIgw9VwoTLV7xTBWZsbebUFVHU5ghQcWku2A==", + "version": "2.41.0", + "resolved": "https://registry.npmmirror.com/urllib/-/urllib-2.41.0.tgz", + "integrity": "sha512-pNXdxEv52L67jahLT+/7QE+Fup1y2Gc6EdmrAhQ6OpQIC2rl14oWwv9hvk1GXOZqEnJNwRXHABuwgPOs1CtL7g==", "requires": { "any-promise": "^1.3.0", "content-type": "^1.0.2", + "debug": "^2.6.9", "default-user-agent": "^1.0.0", "digest-header": "^1.0.0", "ee-first": "~1.1.1", "formstream": "^1.1.0", "humanize-ms": "^1.2.0", - "iconv-lite": "^0.6.3", + "iconv-lite": "^0.4.15", + "ip": "^1.1.5", "pump": "^3.0.0", "qs": "^6.4.0", "statuses": "^1.3.1", "utility": "^1.16.1" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "util-deprecate": { @@ -26651,7 +26641,7 @@ }, "utility": { "version": "1.18.0", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/utility/-/utility-1.18.0.tgz", + "resolved": "https://registry.npmmirror.com/utility/-/utility-1.18.0.tgz", "integrity": "sha512-PYxZDA+6QtvRvm//++aGdmKG/cI07jNwbROz0Ql+VzFV1+Z0Dy55NI4zZ7RHc9KKpBePNFwoErqIuqQv/cjiTA==", "requires": { "copy-to": "^2.0.1", @@ -26883,7 +26873,7 @@ }, "win-release": { "version": "1.1.1", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/win-release/-/win-release-1.1.1.tgz", + "resolved": "https://registry.npmmirror.com/win-release/-/win-release-1.1.1.tgz", "integrity": "sha512-iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw==", "requires": { "semver": "^5.0.1" @@ -26891,7 +26881,7 @@ "dependencies": { "semver": { "version": "5.7.2", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/semver/-/semver-5.7.2.tgz", + "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" } } diff --git a/package.json b/package.json index d22da373..f9ec91b9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "license": "ISC", "dependencies": { "@alicloud/fc2": "^2.6.6", - "@alicloud/fc20230330": "4.1.6-beta.2", + "@alicloud/fc20230330": "4.3.2", "@alicloud/pop-core": "^1.8.0", "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21", "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9", @@ -51,7 +51,8 @@ "temp-dir": "^2.0.0", "tty-table": "^4.2.3", "uuid": "^9.0.1", - "uuid-by-string": "^4.0.0" + "uuid-by-string": "^4.0.0", + "ali-oss": "6.18.1" }, "devDependencies": { "@serverless-devs/component-interface": "^0.0.6", @@ -73,9 +74,6 @@ "resolutions": { "@alicloud/sls20191023": { "registry": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/" - }, - "@alicloud/fc20230330": { - "registry": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/" } } } diff --git a/src/default/config.ts b/src/default/config.ts index 8a42e4a5..1447b640 100644 --- a/src/default/config.ts +++ b/src/default/config.ts @@ -63,7 +63,7 @@ export const IMAGE_ACCELERATION_REGION = [ ]; export const FC_CLIENT_CONNECT_TIMEOUT: number = - parseInt(process.env.FC_CLIENT_CONNECT_TIMEOUT || '5', 10) * 1000; + parseInt(process.env.FC_CLIENT_CONNECT_TIMEOUT || '60', 10) * 1000; export const FC_CLIENT_READ_TIMEOUT: number = parseInt(process.env.FC_CLIENT_READ_TIMEOUT || '60', 10) * 1000;