@nexrender/core 1.51.4 → 1.51.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.51.4",
+  "version": "1.51.8",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab584b346ac92b272667dc0f70f034b5ef714c01"
+  "gitHead": "7f516f852cfc0edc6937f1b49ad1f236d7837d51"
 }

package/src/tasks/script/wrap-footage.js

@@ -6,7 +6,7 @@ const wb = (value) => (value ? 'true' : 'false')
 
 const wrapFootage = (job, settings, { dest, ...asset }) => (`(function() {
     ${selectLayers(job, asset, `function(layer) {
-        nexrender.replaceFootage(layer, '${checkForWSL(dest.replace(/\\/g, "\\\\"), settings)}', ${wb(asset.sequence)}, ${wb(asset.removeOld)})
+        nexrender.replaceFootage(layer, '${checkForWSL(dest.replace(/\\/g, "\\\\").replace(/'/,"\\'"), settings)}', ${wb(asset.sequence)}, ${wb(asset.removeOld)})
     }`)}
 })();\n`)
 

package/test/Scripts/Startup/commandLineRenderer.jsx

@@ -1 +0,0 @@
-// Command line renderer for After Effects. (nexrender-patch-v1.0.3)

package/test/aerender

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-console.log('imitating rendering with aerender :p')
-
-console.log('rendering... 0%')
-Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 1000)
-console.log('rendering... 50%')
-Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 1000)
-console.log('rendering... 100%')
-
-process.exit(0)

package/test/empty.json

@@ -1,13 +0,0 @@
-{
-    "template": {
-        "src": "data:text/plain,Hello, World!",
-        "composition": "test"
-    },
-    "assets": [
-        {
-            "type": "image",
-            "src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",
-            "layerName": "test"
-        }
-    ]
-}

package/test/index-mock.js

@@ -1,28 +0,0 @@
-// simple test code
-const {render} = require('../src')
-
-process.env.NEXRENDER_ENABLE_AELOG_PROJECT_FOLDER = true
-
-const job = {
-    template: {
-        src: 'data:text/plain,Hello, World!',
-        composition: 'test',
-        output: __dirname + '/index.js',
-    },
-    assets: [
-        {
-            type: 'image',
-            src: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==',
-            layerName: 'test',
-        }
-    ]
-}
-
-const settings = {
-    binary: __dirname + '/aerender',
-    workpath: __dirname + '/workpath',
-}
-
-render(job, settings)
-    .then(() => console.log('rendered successfully'))
-    .catch(console.error)

package/test/index.js

@@ -1,2 +0,0 @@
-// simple syntax test
-require('../src')

package/test/manual-win-wsl.js

@@ -1,18 +0,0 @@
-const { init, render } = require('../src');
-const job = require('./mywsljob.json');
-
-const settings = {
-    logger: console,
-    skipCleanup: true,
-    debug: true,
-    wslMap: 'Z',
-    // workpath: '/mnt/d/Downloads/tmp/nexrender'
-}
-
-// console.log(JSON.stringify(job))
-
-render(job, init(settings)).then(job => {
-    console.log('finished rendering', job)
-}).catch(err => {
-    console.error(err)
-})

package/test/manual-win.js

@@ -1,73 +0,0 @@
-const { init, render } = require('../src')
-
-const job = {
-    template: {
-        src: 'file:///D:/Downloads/nexrender-boilerplate-master/assets/nm05ae12.aepx',
-        composition: 'main',
-
-        frameStart: 0,
-        frameEnd: 500,
-    },
-    assets: [
-        {
-            src: 'file:///D:/Downloads/nexrender-boilerplate-master/assets/2016-aug-deep.jpg',
-            type: 'image',
-            layerName: 'background.jpg',
-        },
-        {
-            src: 'file:///D:/Downloads/nexrender-boilerplate-master/assets/nm.png',
-            type: 'image',
-            layerName: 'nm.png',
-        },
-        {
-            src: 'file:///D:/Downloads/nexrender-boilerplate-master/assets/deep_60s.mp3',
-            type: 'audio',
-            useOriginal: true,
-            layerName: 'audio.mp3',
-        },
-        // {
-        //     src: 'https://raw.githubusercontent.com/inlife/nexrender-boilerplate/master/assets/2016-aug-deep.js',
-        //     type: 'script',
-        // },
-        {
-            type: 'data',
-            layerName: 'artist',
-            property: 'position',
-            value: [0, 250],
-            expression: `[5 * time, 250]`,
-        },
-        {
-            type: 'data',
-            layerName: 'track name',
-            property: 'Source Text',
-            value: 'Привет мир',
-        }
-    ],
-    actions: {
-        // prerender: [
-        //     { module: __dirname + '/mytest.js' }
-        // ],
-        postrender: [
-            {
-                module: '@nexrender/action-encode',
-                output: 'output.mp4',
-                preset: 'mp4',
-            }
-        ]
-    },
-    // onChange: (job, state) => console.log('new job state', state)
-}
-
-const settings = {
-    logger: console,
-    skipCleanup: true,
-    debug: true,
-}
-
-// console.log(JSON.stringify(job))
-
-render(job, init(settings)).then(job => {
-    console.log('finished rendering', job)
-}).catch(err => {
-    console.error(err)
-})

package/test/manual.js

@@ -1,74 +0,0 @@
-const { init, render } = require('../src')
-
-const job = {
-    template: {
-        src: 'file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/nm05ae12.aepx',
-        composition: 'main',
-
-        frameStart: 0,
-        frameEnd: 500,
-    },
-    assets: [
-        {
-            src: 'file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/2016-aug-deep.jpg',
-            type: 'image',
-            layerName: 'background.jpg',
-        },
-        {
-            src: 'file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/nm.png',
-            type: 'image',
-            layerName: 'nm.png',
-        },
-        {
-            src: 'file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/deep_60s.mp3',
-            type: 'audio',
-            layerName: 'audio.mp3',
-        },
-        // {
-        //     src: 'https://raw.githubusercontent.com/inlife/nexrender-boilerplate/master/assets/2016-aug-deep.js',
-        //     type: 'script',
-        // },
-        {
-            type: 'data',
-            layerName: 'artist',
-            property: 'position',
-            value: [0, 250],
-            expression: `[5 * time, 250]`,
-        },
-        {
-            type: 'data',
-            layerName: 'track name',
-            property: 'Source Text',
-            value: 'Привет мир',
-        }
-    ],
-    actions: {
-        // prerender: [
-        //     { module: __dirname + '/mytest.js' }
-        // ],
-        postrender: [
-            {
-                module: '@nexrender/action-encode',
-                output: 'output.mp4',
-                preset: 'mp4',
-            }
-        ]
-    },
-
-    onChange: (job, state) => console.log('testing onChange:', state),
-    onRenderProgress: (job, value) => console.log('testing onRenderProgress:', value)
-}
-
-const settings = {
-    logger: console,
-    skipCleanup: true,
-    debug: true,
-}
-
-// console.log(JSON.stringify(job))
-
-render(job, init(settings)).then(job => {
-    console.log('finished rendering', job)
-}).catch(err => {
-    console.error(err)
-})

package/test/myjob.json

@@ -1,50 +0,0 @@
-{
-  "template": {
-    "src": "file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/nm05ae12.aepx",
-    "composition": "main",
-    "frameStart": 0,
-    "frameEnd": 200
-  },
-  "assets": [
-    {
-      "src": "file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/2016-aug-deep.jpg",
-      "type": "image",
-      "layerName": "background.jpg"
-    },
-    {
-      "src": "file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/nm.png",
-      "type": "image",
-      "layerName": "nm.png"
-    },
-    {
-      "src": "file:///Users/inlife/Downloads/nexrender-boilerplate-master/assets/deep_60s.mp3",
-      "type": "audio",
-      "layerName": "audio.mp3"
-    },
-    {
-      "type": "data",
-      "layerName": "artist",
-      "property": "position",
-      "value": [
-        0,
-        250
-      ],
-      "expression": "[5 * time, 250]"
-    },
-    {
-      "type": "data",
-      "layerName": "track name",
-      "property": "Source Text",
-      "value": "Привет мир"
-    }
-  ],
-  "actions": {
-    "postrender": [
-      {
-        "module": "@nexrender/action-encode",
-        "output": "output.mp4",
-        "preset": "mp4"
-      }
-    ]
-  }
-}

package/test/mytest.js

@@ -1,7 +0,0 @@
-module.exports = (job, /* settings */) => {
-    console.log('custom module hello world!')
-    return Promise.resolve(job)
-}
-
-console.log(new URL('d:/Documents/resource.txt'))
-console.log(new URL('data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D'))

package/test/mywsljob.json

@@ -1,49 +0,0 @@
-{
-    "template": {
-        "src": "file:///mnt/d/Downloads/nexrender-boilerplate-master/assets/nm05ae12.aepx",
-        "composition": "main",
-
-        "frameStart": 0,
-        "frameEnd": 500
-    },
-    "assets": [
-        {
-            "src": "file:///mnt/d/Downloads/nexrender-boilerplate-master/assets/2016-aug-deep.jpg",
-            "type": "image",
-            "layerName": "background.jpg"
-        },
-        {
-            "src": "file:///mnt/d/Downloads/nexrender-boilerplate-master/assets/nm.png",
-            "type": "image",
-            "layerName": "nm.png"
-        },
-        {
-            "src": "file:///mnt/d/Downloads/nexrender-boilerplate-master/assets/deep_60s.mp3",
-            "type": "audio",
-            "useOriginal": true,
-            "layerName": "audio.mp3"
-        },
-        {
-            "type": "data",
-            "layerName": "artist",
-            "property": "position",
-            "value": [0, 250],
-            "expression": [50, 250]
-        },
-        {
-            "type": "data",
-            "layerName": "track name",
-            "property": "Source Text",
-            "value": "Test"
-        }
-    ],
-    "actions": {
-        "postrender": [
-            {
-                "module": "@nexrender/action-encode",
-                "output": "output.mp4",
-                "preset": "mp4"
-            }
-        ]
-    }
-}

package/test/paramInjectJob_noInit.json

@@ -1,12 +0,0 @@
-{
-    "template": {
-        "src": "file:///C:/templates/sample.aep",
-        "composition": "BLANK_COMP"
-    },
-    "assets": [
-        {
-            "src": "file:///C:/scripts/paramInject_noInit.jsx",
-            "type": "script"
-        }
-    ]
-}

package/test/paramInject_CustomKeyword.json

@@ -1,19 +0,0 @@
-{
-    "template": {
-        "src": "file:///C:/templates/sample.aep",
-        "composition": "BLANK_COMP"
-    },
-    "assets": [
-        {
-            "src": "file:///C:/scripts/paramInject_JSONInit.jsx",
-            "type": "script",
-            "keyword": "_settings",
-            "parameters": [
-                {
-                    "key": "name",
-                    "value": "Dilip"
-                }
-            ]
-        }
-    ]
-}

package/test/paramInject_JSONInit.jsx

@@ -1,3 +0,0 @@
-{
-    alert("Hello " + NX.name);
-}

package/test/paramInject_JSXInit.jsx

@@ -1,4 +0,0 @@
-{
-    var NX = NX || { name : "John "};
-    alert("Hello " + NX.name);
-}

package/test/paramInject_completeFunctionsExample.json

@@ -1,44 +0,0 @@
-{
-    "template": {
-        "src": "file:///template.aep",
-        "composition": "BLANK_COMP"
-    },
-    "assets": [
-        {
-            "src": "file:///sampleParamInjection.jsx",
-            "type": "script",
-            "parameters": [
-                {
-                    "type": "array",
-                    "key" : "dogs",
-                    "value": [ "Captain Sparkles", "Summer", "Neptune"]
-                },
-                {
-                    "type" : "number",
-                    "key" : "anAmount"
-                },
-                {
-                    "type": "function",
-                    "key": "getDogsCount",
-                    "value" : "function() { return NX.get('dogs').length; }"
-                },
-                {
-                    "type": "function",
-                    "key": "exampleFn",
-                    "value": "function ( parameter ) { return parameter; }"
-                },
-                {
-                    "type" : "function",
-                    "key" : "dogCount",
-                    "value" : "(function(length) { return length })(NX.arg('dogCount'))",
-                    "arguments": [
-                        {
-                            "key" : "dogCount",
-                            "value": ["NX.call('exampleFn', [NX.call('getDogsCount') + NX.get('anAmount')])"]
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}

package/test/paramInject_customKeyword_JSXInit.jsx

@@ -1,4 +0,0 @@
-{
-    var _settings = _settings || { name : "John" };
-    alert("Hello " + _settings.name);
-}

package/test/paramInject_customKeyword_noInit.jsx

@@ -1,4 +0,0 @@
-{
-    // This code will crash if it's executed directly in After Effects. See documentation on how to enable cross environment fault tolerance.
-    alert("Hello " + _settings.name);
-}

package/test/paramInject_functionTypeParameter.json

@@ -1,22 +0,0 @@
-{
-    "template": {
-        "src": "file:///C:/devWork/work/ctrlmotion/sampleTemplates/TCO_FEBRERO_2020_DREAMS.aep",
-        "composition": "BLANK_COMP"
-    },
-    "assets": [
-        {
-            "src": "file:///C:/devWork/work/ctrlmotion/scripts/sampleParamInjection.jsx",
-            "type": "script",
-            "parameters" : [
-                {
-                    "key" : "name",
-                    "value": "(function () { return 1+1; })()"
-                },
-                {
-                    "key" : "dog",
-                    "value": "function doggo() { return 'Doggo' }"
-                }
-            ]
-        }
-    ]
-}

package/test/paramInject_noInit.jsx

@@ -1,4 +0,0 @@
-{
-    // This code will crash if it's executed directly in After Effects. See documentation on how to enable cross environment fault tolerance.
-    alert("Hello " + NX.name);
-}

package/test/paramInject_noJSXInit_commentBlockAndLines.jsx

@@ -1,14 +0,0 @@
-{
-    // The following line should be ignored by the script parameter injection.
-    // var NX = NX || { name: "John" };
-    //var NX = NX || { name: "John" };
-    /* var NX = NX || { name: "John" }; */
-    /* 
-    * var NX = NX || { name: "John" };
-    *var NX = NX || { name: "John" };
-     */
-    /*
-    var NX = NX || { name : "John" };
-    */
-    alert("Hello " + NX.name);
-}

package/test/unit-patch.js

@@ -1,66 +0,0 @@
-const fs = require('fs')
-const assert = require('assert').strict;
-const patch = require('../src/helpers/patch')
-
-describe('helpers/patch', function() {
-    // mock the after effects binary path
-    let mockSettings = { logger: { log: () => {} }, trackSync: () => {}, track: () => {} }
-    let mockBinaryDir = __dirname + '/patch-test'
-    let mockBinaryPath = mockBinaryDir + '/After Effects 2022'
-    let mockBinaryFile = mockBinaryPath + '/aerender'
-    let mockBinaryScript = mockBinaryPath + '/Scripts/Startup/commandLineRenderer.jsx'
-    let mockBackupDir = mockBinaryPath + '/Backup.Scripts/Startup/'
-    let mockBinaryPatched = mockBackupDir + 'commandLineRenderer.jsx'
-
-    // prepare after effects binary directory
-    fs.mkdirSync(mockBinaryDir, { recursive: true })
-    fs.mkdirSync(mockBinaryPath, { recursive: true })
-    fs.mkdirSync(mockBinaryPath + '/Scripts', { recursive: true })
-    fs.mkdirSync(mockBinaryPath + '/Scripts/Startup', { recursive: true })
-    fs.writeFileSync(mockBinaryFile, 'binary')
-    fs.writeFileSync(mockBinaryScript, 'original')
-
-    it('should choose the correct patched content for different AE versions', function(done) {
-        assert(patch.getContentForPatch('2022/bin').indexOf('in_mfr_enable') !== -1)
-        assert(patch.getContentForPatch('2021/bin').indexOf('in_mfr_enable') === -1)
-        done()
-    })
-
-    it('should correctly return NOT_PATCHED', function(done) {
-        assert.strictEqual(patch.getPatchStatus(mockBinaryFile), patch.PATCH_STATUS.NOT_PATCHED)
-        done()
-    })
-
-    it('should apply the patch correctly', function(done) {
-        patch({ binary: mockBinaryFile, ...mockSettings })
-        assert.strictEqual(patch.getPatchStatus(mockBinaryFile), patch.PATCH_STATUS.PATCHED)
-        assert.strictEqual(fs.readFileSync(mockBinaryScript, 'utf8').indexOf('nexrender-patch-v') !== -1, true)
-        // check backup exists
-        assert.strictEqual(fs.existsSync(mockBinaryPatched), true)
-        assert.strictEqual(fs.readFileSync(mockBinaryPatched, 'utf8').indexOf('nexrender-patch-v') === -1, true)
-        done()
-    })
-
-    it('should correctly return PATCHED', function(done) {
-        assert.strictEqual(patch.getPatchStatus(mockBinaryFile), patch.PATCH_STATUS.PATCHED)
-        done()
-    })
-
-    it('should correctly return OUTDATED', function(done) {
-        fs.writeFileSync(mockBinaryScript, 'nexrender-patch-v0.0.0\n' + fs.readFileSync(mockBinaryScript, 'utf8'))
-        assert.strictEqual(patch.getPatchStatus(mockBinaryFile), patch.PATCH_STATUS.OUTDATED)
-        done()
-    })
-
-    // Cleanup after tests
-    after(function() {
-        // Remove created files and directories
-        fs.unlinkSync(mockBinaryScript)
-        fs.unlinkSync(mockBinaryFile)
-        fs.rmdirSync(mockBinaryPath + '/Scripts/Startup', { recursive: true })
-        fs.rmdirSync(mockBinaryPath + '/Scripts', { recursive: true })
-        fs.rmdirSync(mockBinaryPath, { recursive: true })
-        fs.rmdirSync(mockBinaryDir, { recursive: true })
-
-    })
-});

package/test/workpath/7LyC6arUCXaJkBo7IORV-/aerender.log

@@ -1,4 +0,0 @@
-imitating rendering with aerender :p
-rendering... 0%
-rendering... 50%
-rendering... 100%