@nexrender/core 1.50.3 → 1.50.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.50.3",
+  "version": "1.50.6",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -21,8 +21,7 @@
     "nanoid": "^3.2.0",
     "requireg": "^0.2.1",
     "rimraf": "^3.0.2",
-    "strip-comments": "^2.0.1",
-    "systeminformation": "^5.18.3"
+    "strip-comments": "^2.0.1"
   },
   "peerDependencies": {
     "@nexrender/action-copy": "^1.0.0",
@@ -38,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "320dd0547f5ab2bb4c402bc56d0805013e20db96"
+  "gitHead": "1ce7a7b0736385a8cd661b702e7b05832046e295"
 }

package/src/helpers/analytics.js

@@ -3,7 +3,6 @@ const os           = require('os')
 const path         = require('path')
 const crypto       = require('crypto')
 
-const si           = require('systeminformation')
 const { nanoid }   = require('nanoid')
 const childProcess = require('child_process')
 
@@ -96,32 +95,32 @@ const track = async (settings, event, properties = {}) => {
         return;
     }
 
-    // collect system info
-    if (!settings.systemInfo) {
-        // if (isRemote) console.log('collecting systeminfo')
-
-        settings.systemInfo = await si.get({
-            cpu: 'manufacturer,brand,cores',
-            mem: 'total',
-            graphics: '*',
-            osInfo: 'platform,arch,distro,release',
-            dockerInfo: 'id',
-        })
-
-        properties.$set_once = {
-            sys_cpu_manufacturer: settings.systemInfo.cpu.manufacturer,
-            sys_cpu_brand: settings.systemInfo.cpu.brand,
-            sys_cpu_cores: settings.systemInfo.cpu.cores,
-            sys_mem_total: settings.systemInfo.mem.total,
-            sys_graphics_vendor: (settings.systemInfo.graphics.controllers[0] || []).vendor,
-            sys_graphics_model: (settings.systemInfo.graphics.controllers[0] || []).model,
-            sys_os_platform: settings.systemInfo.osInfo.platform,
-            sys_os_arch: settings.systemInfo.osInfo.arch,
-            sys_os_distro: settings.systemInfo.osInfo.distro,
-            sys_os_release: settings.systemInfo.osInfo.release,
-            sys_docker: !!settings.systemInfo.dockerInfo.id,
-        }
-    }
+    // // collect system info
+    // if (!settings.systemInfo) {
+    //     // if (isRemote) console.log('collecting systeminfo')
+
+    //     settings.systemInfo = await si.get({
+    //         cpu: 'manufacturer,brand,cores',
+    //         mem: 'total',
+    //         graphics: '*',
+    //         osInfo: 'platform,arch,distro,release',
+    //         dockerInfo: 'id',
+    //     })
+
+    //     properties.$set_once = {
+    //         sys_cpu_manufacturer: settings.systemInfo.cpu.manufacturer,
+    //         sys_cpu_brand: settings.systemInfo.cpu.brand,
+    //         sys_cpu_cores: settings.systemInfo.cpu.cores,
+    //         sys_mem_total: settings.systemInfo.mem.total,
+    //         sys_graphics_vendor: (settings.systemInfo.graphics.controllers[0] || []).vendor,
+    //         sys_graphics_model: (settings.systemInfo.graphics.controllers[0] || []).model,
+    //         sys_os_platform: settings.systemInfo.osInfo.platform,
+    //         sys_os_arch: settings.systemInfo.osInfo.arch,
+    //         sys_os_distro: settings.systemInfo.osInfo.distro,
+    //         sys_os_release: settings.systemInfo.osInfo.release,
+    //         sys_docker: !!settings.systemInfo.dockerInfo.id,
+    //     }
+    // }
 
     if (event == 'Job Cleanup') {
         const events = Object.keys(cache.data)

package/src/helpers/license.js

@@ -2,12 +2,16 @@ const fs    = require('fs')
 const os    = require('os')
 const path  = require('path')
 
-module.exports = (settings) => {
-    const filename  = 'ae_render_only_node.txt'
-    const documents = path.join(os.homedir(), 'Documents')
-    const adobe     = path.join(documents, 'Adobe')
-    const nodefile1 = path.join(documents, filename)
-    const nodefile2 = path.join(adobe, filename)
+const filename  = 'ae_render_only_node.txt'
+const documents = path.join(os.homedir(), 'Documents')
+const adobe     = path.join(documents, 'Adobe')
+const nodefile1 = path.join(documents, filename)
+const nodefile2 = path.join(adobe, filename)
+
+const add = (settings) => {
+    if (!settings.addLicense) {
+        return false
+    }
 
     settings.logger.log('adding default render-only-node licenses for After Effects at:')
     settings.logger.log(' - ' + nodefile1)
@@ -33,4 +37,28 @@ module.exports = (settings) => {
         settings.track('Init Render License Added')
         settings.logger.log('added render-only-node licenses for After Effects')
     }
+
+    return applied
 }
+
+const remove = (settings) => {
+    let removed = false
+
+    if (fs.existsSync(nodefile1)) {
+        fs.unlinkSync(nodefile1)
+        removed = true
+    }
+
+    if (fs.existsSync(nodefile2)) {
+        fs.unlinkSync(nodefile2)
+        removed = true
+    }
+
+    if (removed) {
+        settings.logger.log('removed render-only-node licenses for After Effects')
+    }
+
+    return removed
+}
+
+module.exports = { add, remove }

package/src/index.js

@@ -114,9 +114,7 @@ const init = (settings) => {
     }
 
     // add license helper
-    if (settings.addLicense) {
-        license(settings);
-    }
+    license.add(settings);
 
     // attempt to patch the default
     // Scripts/commandLineRenderer.jsx