Updated file headers.

exander77 · Jan 9, 2021 · b195852 · b195852
1 parent 2c292a9
commit b195852
Show file tree

Hide file tree

Showing 64 changed files with 84 additions and 103 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017-2020 Intel Corporation
+   Copyright 2017-2021 Intel Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/agents/meshcmd.js b/agents/meshcmd.js
diff --git a/agents/meshcore.js b/agents/meshcore.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -488,31 +488,22 @@ function createMeshCore(agent) {
         mesh.SendCommand(msg);
     }
 
-    // If we are running in Duktape, agent will be null
-    if (agent == null) {
-        // Running in native agent, Import libraries
-        db = require('SimpleDataStore').Shared();
-        sha = require('SHA256Stream');
-        mesh = require('MeshAgent');
-        childProcess = require('child_process');
-        if (mesh.hasKVM == 1) { // if the agent is compiled with KVM support
-            // Check if this computer supports a desktop
-            try
-            {
-                if ((process.platform == 'win32') || (process.platform == 'darwin') || (require('monitor-info').kvm_x11_support)) {
-                    meshCoreObj.caps |= 1; meshCoreObjChanged();
-                } else if (process.platform == 'linux' || process.platform == 'freebsd') {
-                    require('monitor-info').on('kvmSupportDetected', function (value) { meshCoreObj.caps |= 1; meshCoreObjChanged(); });
-                }
-            } catch (e) { }
-        }
-    } else {
-        // Running in nodejs
-        meshCoreObj.value += '-NodeJS';
-        meshCoreObj.caps = 8;
-        mesh = agent.getMeshApi();
+    // Import libraries
+    db = require('SimpleDataStore').Shared();
+    sha = require('SHA256Stream');
+    mesh = require('MeshAgent');
+    childProcess = require('child_process');
+    if (mesh.hasKVM == 1) { // if the agent is compiled with KVM support
+        // Check if this computer supports a desktop
+        try
+        {
+            if ((process.platform == 'win32') || (process.platform == 'darwin') || (require('monitor-info').kvm_x11_support)) {
+                meshCoreObj.caps |= 1; meshCoreObjChanged();
+            } else if (process.platform == 'linux' || process.platform == 'freebsd') {
+                require('monitor-info').on('kvmSupportDetected', function (value) { meshCoreObj.caps |= 1; meshCoreObjChanged(); });
+            }
+        } catch (e) { }
     }
-
     mesh.DAIPC = obj.DAIPC;
 
     /*
@@ -3945,21 +3936,11 @@ function createMeshCore(agent) {
 }
 
 //
-// Module startup
+// Startup for Duktape only. This file is not intended to run in NodeJS.
 //
-
 try {
-    var xexports = null, mainMeshCore = null;
-    try { xexports = module.exports; } catch (e) { }
-
-    if (xexports != null) {
-        // If we are running within NodeJS, export the core
-        module.exports.createMeshCore = createMeshCore;
-    } else {
-        // If we are not running in NodeJS, launch the core
-        mainMeshCore = createMeshCore();
-        mainMeshCore.start(null);
-    }
+    mainMeshCore = createMeshCore();
+    mainMeshCore.start(null);
 } catch (e) {
     require('MeshAgent').SendCommand({ action: 'msg', type: 'console', value: "uncaughtException2: " + ex });
 }
diff --git a/agents/meshinstall-linux.js b/agents/meshinstall-linux.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt-apfclient.js b/agents/modules_meshcmd/amt-apfclient.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ limitations under the License.
 /**
 * @description APF/CIRA Client for Duktape
 * @author Joko Sastriawan & Ylian Saint-Hilaire
-* @copyright Intel Corporation 2020
+* @copyright Intel Corporation 2020-2021
 * @license Apache-2.0
 * @version v0.0.2
 */

diff --git a/agents/modules_meshcmd/amt-lme.js b/agents/modules_meshcmd/amt-lme.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt-mei.js b/agents/modules_meshcmd/amt-mei.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt-scanner.js b/agents/modules_meshcmd/amt-scanner.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt-wsman-duk.js b/agents/modules_meshcmd/amt-wsman-duk.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt-wsman.js b/agents/modules_meshcmd/amt-wsman.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt-xml.js b/agents/modules_meshcmd/amt-xml.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/amt.js b/agents/modules_meshcmd/amt.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcmd/sysinfo.js b/agents/modules_meshcmd/sysinfo.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Intel Corporation
+Copyright 2019-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/amt-apfclient.js b/agents/modules_meshcore/amt-apfclient.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ limitations under the License.
 /**
 * @description APF/CIRA Client for Duktape
 * @author Joko Sastriawan & Ylian Saint-Hilaire
-* @copyright Intel Corporation 2020
+* @copyright Intel Corporation 2020-2021
 * @license Apache-2.0
 * @version v0.0.2
 */

diff --git a/agents/modules_meshcore/amt-lme.js b/agents/modules_meshcore/amt-lme.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/amt-manage.js b/agents/modules_meshcore/amt-manage.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/amt-mei.js b/agents/modules_meshcore/amt-mei.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/monitor-border.js b/agents/modules_meshcore/monitor-border.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/sysinfo.js b/agents/modules_meshcore/sysinfo.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Intel Corporation
+Copyright 2019-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/wifi-scanner-windows.js b/agents/modules_meshcore/wifi-scanner-windows.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/wifi-scanner.js b/agents/modules_meshcore/wifi-scanner.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/win-console.js b/agents/modules_meshcore/win-console.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/modules_meshcore/win-info.js b/agents/modules_meshcore/win-info.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Intel Corporation
+Copyright 2019-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/testsuite.js b/agents/testsuite.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017-2020 Intel Corporation
+Copyright 2017-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/agents/tinycore.js b/agents/tinycore.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 Intel Corporation
+Copyright 2018-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt-ider.js b/amt-ider.js
@@ -1,7 +1,7 @@
 /**
 * @description MeshCentral Server IDER handler
 * @author Ylian Saint-Hilaire & Bryan Roe
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.1
 */

diff --git a/amt/amt-ider-module.js b/amt/amt-ider-module.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt-ider.js b/amt/amt-ider.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt-redir-mesh.js b/amt/amt-redir-mesh.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt-setupbin.js b/amt/amt-setupbin.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt-wsman-comm.js b/amt/amt-wsman-comm.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt-wsman.js b/amt/amt-wsman.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt-xml.js b/amt/amt-xml.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amt/amt.js b/amt/amt.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Intel Corporation
+Copyright 2020-2021 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/amtevents.js b/amtevents.js
@@ -1,7 +1,7 @@
 /**
 * @description MeshCentral Intel(R) AMT Event Parser
 * @author Ylian Saint-Hilaire & Bryan Roe
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.1
 */

diff --git a/amtmanager.js b/amtmanager.js
@@ -1,7 +1,7 @@
 /**
 * @description MeshCentral Intel AMT manager
 * @author Ylian Saint-Hilaire
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.1
 */

diff --git a/amtscanner.js b/amtscanner.js
@@ -1,7 +1,7 @@
 /**
 * @description MeshCentral Intel(R) AMT Local Scanner
 * @author Ylian Saint-Hilaire & Joko Sastriawan
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.1
 */

diff --git a/amtscript.js b/amtscript.js
@@ -1,7 +1,7 @@
 /**
 * @fileoverview Script Compiler / Decompiler / Runner
 * @author Ylian Saint-Hilaire
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.1.0e
 */

diff --git a/certoperations.js b/certoperations.js
@@ -1,7 +1,7 @@
 /**
 * @description Certificate generator
 * @author Joko Sastriawan / Ylian Saint-Hilaire
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.1
 */

diff --git a/common.js b/common.js
@@ -1,7 +1,7 @@
 /**
 * @description MeshCentral Common Library
 * @author Ylian Saint-Hilaire
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.1
 */

diff --git a/db.js b/db.js
@@ -1,7 +1,7 @@
 /** 
 * @description MeshCentral database module
 * @author Ylian Saint-Hilaire
-* @copyright Intel Corporation 2018-2020
+* @copyright Intel Corporation 2018-2021
 * @license Apache-2.0
 * @version v0.0.2
 */