@nexrender/core 1.37.1 → 1.37.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -4
- package/src/index.js +5 -1
- package/src/tasks/download.js +2 -1
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nexrender/core",
|
|
3
|
-
"version": "1.37.
|
|
3
|
+
"version": "1.37.6",
|
|
4
4
|
"main": "src/index.js",
|
|
5
5
|
"author": "Inlife",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"pkg-prelink": "node ../../misc/prelink.js"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@nexrender/types": "^1.
|
|
10
|
+
"@nexrender/types": "^1.37.6",
|
|
11
11
|
"data-uri-to-buffer": "^3.0.0",
|
|
12
12
|
"file-uri-to-path": "^2.0.0",
|
|
13
13
|
"is-wsl": "^2.2.0",
|
|
14
14
|
"match-all": "^1.2.5",
|
|
15
15
|
"mime-types": "^2.1.29",
|
|
16
16
|
"mkdirp": "^1.0.4",
|
|
17
|
-
"node-fetch": "^2.6.
|
|
17
|
+
"node-fetch": "^2.6.7",
|
|
18
18
|
"requireg": "^0.2.1",
|
|
19
19
|
"rimraf": "^3.0.2"
|
|
20
20
|
},
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"publishConfig": {
|
|
30
30
|
"access": "public"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "d774ddc6a0aabff1072a29460498058331a20f89"
|
|
33
33
|
}
|
package/src/index.js
CHANGED
|
@@ -31,6 +31,7 @@ if (process.env.NEXRENDER_REQUIRE_PLUGINS) {
|
|
|
31
31
|
require('@nexrender/provider-s3');
|
|
32
32
|
require('@nexrender/provider-ftp');
|
|
33
33
|
require('@nexrender/provider-gs');
|
|
34
|
+
require('@nexrender/provider-sftp');
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
//
|
|
@@ -119,4 +120,7 @@ const render = (job, settings = {}) => {
|
|
|
119
120
|
.then(job => state(job, settings, cleanup, 'cleanup'))
|
|
120
121
|
}
|
|
121
122
|
|
|
122
|
-
module.exports = {
|
|
123
|
+
module.exports = {
|
|
124
|
+
init,
|
|
125
|
+
render
|
|
126
|
+
}
|
package/src/tasks/download.js
CHANGED
|
@@ -25,6 +25,7 @@ const download = (job, settings, asset) => {
|
|
|
25
25
|
destName = path.basename(asset.src)
|
|
26
26
|
destName = destName.indexOf('?') !== -1 ? destName.slice(0, destName.indexOf('?')) : destName;
|
|
27
27
|
/* ^ remove possible query search string params ^ */
|
|
28
|
+
destName = decodeURI(destName) /* < remove/decode any special URI symbols within filename */
|
|
28
29
|
|
|
29
30
|
/* prevent same name file collisions */
|
|
30
31
|
if (fs.existsSync(path.join(job.workpath, destName))) {
|
|
@@ -66,7 +67,7 @@ const download = (job, settings, asset) => {
|
|
|
66
67
|
case 'http':
|
|
67
68
|
case 'https':
|
|
68
69
|
/* TODO: maybe move to external package ?? */
|
|
69
|
-
const src = decodeURI(asset.src) === asset.src ?
|
|
70
|
+
const src = decodeURI(asset.src) === asset.src ? encodeURI(asset.src): asset.src
|
|
70
71
|
return fetch(src, asset.params || {})
|
|
71
72
|
.then(res => res.ok ? res : Promise.reject({reason: 'Initial error downloading file', meta: {src, error: res.error}}))
|
|
72
73
|
.then(res => {
|