@nexrender/core 1.54.4 → 1.57.0
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 +2 -2
- package/src/helpers/autofind.js +5 -1
- package/src/index.js +1 -0
- package/src/tasks/render.js +2 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nexrender/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.57.0",
|
|
4
4
|
"main": "src/index.js",
|
|
5
5
|
"author": "Inlife",
|
|
6
6
|
"homepage": "https://www.nexrender.com",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "f46ff82538d354e060ed6797d97f19d1a96356cd"
|
|
45
45
|
}
|
package/src/helpers/autofind.js
CHANGED
|
@@ -19,6 +19,7 @@ const defaultPaths = {
|
|
|
19
19
|
'/Applications/Adobe After Effects CC 2022',
|
|
20
20
|
'/Applications/Adobe After Effects CC 2023',
|
|
21
21
|
'/Applications/Adobe After Effects CC 2024',
|
|
22
|
+
'/Applications/Adobe After Effects CC 2025',
|
|
22
23
|
],
|
|
23
24
|
win32: [
|
|
24
25
|
'C:\\Program Files\\Adobe\\After Effects CC',
|
|
@@ -34,7 +35,7 @@ const defaultPaths = {
|
|
|
34
35
|
'C:\\Program Files\\Adobe\\After Effects 2022\\Support Files',
|
|
35
36
|
'C:\\Program Files\\Adobe\\After Effects 2023\\Support Files',
|
|
36
37
|
'C:\\Program Files\\Adobe\\After Effects 2024\\Support Files',
|
|
37
|
-
|
|
38
|
+
'C:\\Program Files\\Adobe\\After Effects 2025\\Support Files',
|
|
38
39
|
'C:\\Program Files\\Adobe\\Adobe After Effects CC',
|
|
39
40
|
'C:\\Program Files\\Adobe\\Adobe After Effects CC\\Support Files',
|
|
40
41
|
'C:\\Program Files\\Adobe\\Adobe After Effects CC 2015\\Support Files',
|
|
@@ -48,6 +49,7 @@ const defaultPaths = {
|
|
|
48
49
|
'C:\\Program Files\\Adobe\\Adobe After Effects 2022\\Support Files',
|
|
49
50
|
'C:\\Program Files\\Adobe\\Adobe After Effects 2023\\Support Files',
|
|
50
51
|
'C:\\Program Files\\Adobe\\Adobe After Effects 2024\\Support Files',
|
|
52
|
+
'C:\\Program Files\\Adobe\\Adobe After Effects 2025\\Support Files',
|
|
51
53
|
],
|
|
52
54
|
wsl: [
|
|
53
55
|
'/mnt/c/Program Files/Adobe/After Effects CC',
|
|
@@ -63,6 +65,7 @@ const defaultPaths = {
|
|
|
63
65
|
'/mnt/c/Program Files/Adobe/After Effects 2022/Support Files',
|
|
64
66
|
'/mnt/c/Program Files/Adobe/After Effects 2023/Support Files',
|
|
65
67
|
'/mnt/c/Program Files/Adobe/After Effects 2024/Support Files',
|
|
68
|
+
'/mnt/c/Program Files/Adobe/After Effects 2025/Support Files',
|
|
66
69
|
|
|
67
70
|
'/mnt/c/Program Files/Adobe/Adobe After Effects CC',
|
|
68
71
|
'/mnt/c/Program Files/Adobe/Adobe After Effects CC/Support Files',
|
|
@@ -77,6 +80,7 @@ const defaultPaths = {
|
|
|
77
80
|
'/mnt/c/Program Files/Adobe/Adobe After Effects 2022/Support Files',
|
|
78
81
|
'/mnt/c/Program Files/Adobe/Adobe After Effects 2023/Support Files',
|
|
79
82
|
'/mnt/c/Program Files/Adobe/Adobe After Effects 2024/Support Files',
|
|
83
|
+
'/mnt/c/Program Files/Adobe/Adobe After Effects 2025/Support Files',
|
|
80
84
|
],
|
|
81
85
|
}
|
|
82
86
|
|
package/src/index.js
CHANGED
|
@@ -97,6 +97,7 @@ const init = (settings) => {
|
|
|
97
97
|
|
|
98
98
|
// amount of seconds before job will be marked as "stuck"
|
|
99
99
|
maxUpdateTimeout: process.env.NEXRENDER_MAX_UPDATE_TIMEOUT || 60,
|
|
100
|
+
killAEFXOnRenderTimeout: process.env.NEXRENDER_KILL_AEFX_ON_RENDER_TIMEOUT || false,
|
|
100
101
|
|
|
101
102
|
__initialized: true,
|
|
102
103
|
}, settings, {
|
package/src/tasks/render.js
CHANGED
|
@@ -294,7 +294,8 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
|
|
|
294
294
|
settings.trackSync('Job Render Failed', { job_id: job.uid, error: 'aerender_timeout' });
|
|
295
295
|
reject(new Error(`Maximum rendering time exceeded`));
|
|
296
296
|
crossPlatformKill(instance)
|
|
297
|
-
|
|
297
|
+
if (settings.killAEFXOnRenderTimeout)
|
|
298
|
+
killProcessByName('AfterFX.com')
|
|
298
299
|
},
|
|
299
300
|
timeout
|
|
300
301
|
);
|