@ngageoint/mage.service 6.3.0-beta.7 → 6.3.0

package/bin/mage.service.js

@@ -48,6 +48,8 @@ const options = [
   new Option('--security-dir <string>').env('MAGE_SECURITY_DIR').default('/var/lib/mage/security'),
   new Option('--temp-dir <string>').env('MAGE_TEMP_DIR').default('/tmp'),
   new Option('--user-dir <string>').env('MAGE_USER_DIR').default('/var/lib/mage/users'),
+  new Option('--sftp-key-dir <string>').env('MAGE_SFTP_KEY_DIR').default('/var/lib/mage/sftp-keys'),
+  new Option('--sftp-key-file <string>').env('MAGE_SFTP_KEY_FILE').default('/var/lib/mage/sftp-keys/mage-sftp-key'),
   new Option('--export-sweep-interval <number>').env('MAGE_EXPORT_SWEEP_INTERVAL').default(28800, '8 hours').argParser(x => parseInt(x)),
   new Option('--export-ttl <number>').env('MAGE_EXPORT_TTL').default(259200, '72 hours').argParser(x => parseInt(x)),
   new Option('--token-expiration <number>').env('MAGE_TOKEN_EXPIRATION').default(28800, '8 hours').argParser(x => parseInt(x)),
@@ -98,9 +100,9 @@ const configKeyForOptKey = {
 
 function mergeOptsToConfig(opts) {
   const config = opts.config ? opts.config.mage || {} : {};
-  const manualMergeKeys = [ 'config', 'plugins', 'plugin', 'webPlugin' ];
+  const manualMergeKeys = ['config', 'plugins', 'plugin', 'webPlugin'];
   const optsSimple = _.omit(opts, manualMergeKeys);
-  const DefaultValue = function(x) {
+  const DefaultValue = function (x) {
     this.value = x;
   };
   const optsDefaultsMarked = _.mapValues(optsSimple, (value, key) => {
@@ -124,17 +126,17 @@ function mergeOptsToConfig(opts) {
     }
     if (typeof configValue === 'object') {
       // nested object - continue recursive merge
-      return void(0);
+      return void (0);
     }
     if (!configValue) {
-      return optValue instanceof DefaultValue ? optValue.value : void(0);
+      return optValue instanceof DefaultValue ? optValue.value : void (0);
     }
     if (optValue instanceof DefaultValue) {
       return configValue;
     }
     if (typeof optValue === 'object') {
       // nested object - continue recursive merge
-      return void(0);
+      return void (0);
     }
     return optValue;
   });

package/lib/dist-package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngageoint/mage.service",
-  "version": "6.3.0-beta.7",
+  "version": "6.3.0",
   "displayName": "MAGE Service",
   "description": "MAGE is a geospatial situational awareness and data collection platform.  The MAGE Service is the ReST service API that the MAGE client apps use to interact with MAGE data.",
   "keywords": [

package/lib/docs/openapi.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.1
 info:
-  title: MAGE (Mobile Awareness GEOINT Environment) API
+  title: MAGE API
   description: MAGE API
   contact:
     name: MAGE Support

package/lib/routes/imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/routes/imports.js"],"names":[],"mappings":"AAAiB,yDA4DhB"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/routes/imports.js"],"names":[],"mappings":"AAAiB,yDAgEhB"}

package/lib/routes/imports.js

@@ -12,11 +12,15 @@ module.exports = function (app, security) {
         fs.readFile(req.file.path, 'utf8', function (err, data) {
             if (err)
                 return next(err);
-            const kml = new DOMParser({
-                errorHandler: (level, message) => {
-                    console.log('kml parsing', level, req.file.filename, message);
-                }
-            }).parseFromString(data);
+            const parser = new DOMParser();
+            const kml = parser.parseFromString(data, "application/xml");
+            const parseError = kml.getElementsByTagName("parsererror");
+            if (parseError.length > 0) {
+                console.error("KML Parsing Error:", parseError[0].textContent);
+            }
+            else {
+                console.log("Parsed KML successfully");
+            }
             if (!kml || kml.documentElement.nodeName !== 'kml') {
                 return res.status(400).send('Invalid file, please upload a KML file.');
             }
@@ -30,7 +34,7 @@ module.exports = function (app, security) {
             .then(newFeatures => {
             const response = {
                 files: [{
-                        name: req.file.originalname,
+                        name: Buffer.from(req.file.originalname, 'latin1').toString('utf-8'),
                         size: req.file.size,
                         features: newFeatures ? newFeatures.length : 0
                     }]

package/lib/routes/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/routes/imports.js"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,GAAG,UAAS,GAAG,EAAE,QAAQ;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,EACzB,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,EAC7B,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,EACxB,EAAC,cAAc,EAAE,MAAM,EAAC,GAAG,OAAO,CAAC,WAAW,CAAC,EAC/C,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,SAAS,EAC/C,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAElD,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;IAElD,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QAC9B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAChC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;SAChF;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACb,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;SACxE;QAED,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,IAAI;YACpD,IAAI,GAAG;gBAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YAE1B,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;gBACxB,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;gBAC/D,CAAC;aACF,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAEzB,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ,KAAK,KAAK,EAAE;gBAClD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;aACxE;YAED,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;YACd,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,IAAI,CACN,0BAA0B,EAC1B,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC/B,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAChC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,QAAQ,EACR,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;QACrB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;aAChD,IAAI,CAAC,WAAW,CAAC,EAAE;YAClB,MAAM,QAAQ,GAAG;gBACf,KAAK,EAAE,CAAC;wBACN,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY;wBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;wBACnB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;qBAC/C,CAAC;aACH,CAAC;YAEF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/routes/imports.js"],"names":[],"mappings":"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"}