geoserver-node-client 1.2.4 → 1.4.0

package/dist/src/util/geoserver.js

@@ -1,37 +1,24 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GeoServerResponseError = void 0;
 exports.getGeoServerResponseText = getGeoServerResponseText;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 /**
  * Utility functions and classes
  */
-
 /**
  * Return the GeoServer response text if available.
  *
@@ -45,53 +32,42 @@ function getGeoServerResponseText(_x) {
 /**
  * Generic GeoServer error
  */
-
-
 function _getGeoServerResponseText() {
   _getGeoServerResponseText = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(response) {
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            return _context.abrupt("return", response.text());
-
-          case 4:
-            _context.prev = 4;
-            _context.t0 = _context["catch"](0);
-
-          case 6:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          return _context.abrupt("return", response.text());
+        case 4:
+          _context.prev = 4;
+          _context.t0 = _context["catch"](0);
+        case 6:
+        case "end":
+          return _context.stop();
       }
     }, _callee, null, [[0, 4]]);
   }));
   return _getGeoServerResponseText.apply(this, arguments);
 }
-
 var GeoServerResponseError = /*#__PURE__*/function (_Error) {
   (0, _inherits2["default"])(GeoServerResponseError, _Error);
-
   var _super = _createSuper(GeoServerResponseError);
-
   /**
    * @param {String} [message=GeoServer Response Error] The error message
    * @param {String} [geoServerOutput] The error output from GeoServer (useful for debugging)
    */
   function GeoServerResponseError(message, geoServerOutput) {
     var _this;
-
     (0, _classCallCheck2["default"])(this, GeoServerResponseError);
     _this = _super.call(this, message);
     _this.name = 'GeoServerResponseError';
-    _this.message = message || 'GeoServer Response Error'; // custom property as explained here: https://xjamundx.medium.com/custom-javascript-errors-in-es6-aa891b173f87
+    _this.message = message || 'GeoServer Response Error';
 
+    // custom property as explained here: https://xjamundx.medium.com/custom-javascript-errors-in-es6-aa891b173f87
     _this.geoServerOutput = geoServerOutput;
     return _this;
   }
-
   return (0, _createClass2["default"])(GeoServerResponseError);
 }( /*#__PURE__*/(0, _wrapNativeSuper2["default"])(Error));
-
 exports.GeoServerResponseError = GeoServerResponseError;

package/dist/src/workspace.js

@@ -1,26 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _geoserver = require("./util/geoserver.js");
-
 var _about = _interopRequireDefault(require("./about.js"));
-
 /**
  * Client for GeoServer workspaces
  *
@@ -40,6 +31,7 @@ var WorkspaceClient = /*#__PURE__*/function () {
     this.url = url;
     this.auth = auth;
   }
+
   /**
    * Returns all workspaces.
    *
@@ -47,56 +39,44 @@ var WorkspaceClient = /*#__PURE__*/function () {
    *
    * @returns {Object} An Object describing the workspaces
    */
-
-
   (0, _createClass2["default"])(WorkspaceClient, [{
     key: "getAll",
     value: function () {
       var _getAll = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var response, geoServerResponse;
         return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return (0, _nodeFetch["default"])(this.url + 'workspaces.json', {
-                  credentials: 'include',
-                  method: 'GET',
-                  headers: {
-                    Authorization: this.auth
-                  }
-                });
-
-              case 2:
-                response = _context.sent;
-
-                if (response.ok) {
-                  _context.next = 8;
-                  break;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return (0, _nodeFetch["default"])(this.url + 'workspaces.json', {
+                credentials: 'include',
+                method: 'GET',
+                headers: {
+                  Authorization: this.auth
                 }
-
-                _context.next = 6;
-                return (0, _geoserver.getGeoServerResponseText)(response);
-
-              case 6:
-                geoServerResponse = _context.sent;
-                throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-
-              case 8:
-                return _context.abrupt("return", response.json());
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
+              });
+            case 2:
+              response = _context.sent;
+              if (response.ok) {
+                _context.next = 8;
+                break;
+              }
+              _context.next = 6;
+              return (0, _geoserver.getGeoServerResponseText)(response);
+            case 6:
+              geoServerResponse = _context.sent;
+              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+            case 8:
+              return _context.abrupt("return", response.json());
+            case 9:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function getAll() {
         return _getAll.apply(this, arguments);
       }
-
       return getAll;
     }()
     /**
@@ -108,68 +88,54 @@ var WorkspaceClient = /*#__PURE__*/function () {
      *
      * @returns {Object} An object describing the workspaces
      */
-
   }, {
     key: "get",
     value: function () {
       var _get = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(name) {
         var response, grc, geoServerResponse;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return (0, _nodeFetch["default"])(this.url + 'workspaces/' + name + '.json', {
-                  credentials: 'include',
-                  method: 'GET',
-                  headers: {
-                    Authorization: this.auth
-                  }
-                });
-
-              case 2:
-                response = _context2.sent;
-
-                if (response.ok) {
-                  _context2.next = 15;
-                  break;
-                }
-
-                grc = new _about["default"](this.url, this.auth);
-                _context2.next = 7;
-                return grc.exists();
-
-              case 7:
-                if (!_context2.sent) {
-                  _context2.next = 11;
-                  break;
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return (0, _nodeFetch["default"])(this.url + 'workspaces/' + name + '.json', {
+                credentials: 'include',
+                method: 'GET',
+                headers: {
+                  Authorization: this.auth
                 }
-
-                return _context2.abrupt("return");
-
-              case 11:
-                _context2.next = 13;
-                return (0, _geoserver.getGeoServerResponseText)(response);
-
-              case 13:
-                geoServerResponse = _context2.sent;
-                throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-
-              case 15:
-                return _context2.abrupt("return", response.json());
-
-              case 16:
-              case "end":
-                return _context2.stop();
-            }
+              });
+            case 2:
+              response = _context2.sent;
+              if (response.ok) {
+                _context2.next = 15;
+                break;
+              }
+              grc = new _about["default"](this.url, this.auth);
+              _context2.next = 7;
+              return grc.exists();
+            case 7:
+              if (!_context2.sent) {
+                _context2.next = 11;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 11:
+              _context2.next = 13;
+              return (0, _geoserver.getGeoServerResponseText)(response);
+            case 13:
+              geoServerResponse = _context2.sent;
+              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+            case 15:
+              return _context2.abrupt("return", response.json());
+            case 16:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function get(_x) {
         return _get.apply(this, arguments);
       }
-
       return get;
     }()
     /**
@@ -181,70 +147,61 @@ var WorkspaceClient = /*#__PURE__*/function () {
      *
      * @returns {String} The name of the created workspace
      */
-
   }, {
     key: "create",
     value: function () {
       var _create = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(name) {
-        var body, response, geoServerResponse;
+        var body, response, geoServerResponse, wsObject;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                body = {
-                  workspace: {
-                    name: name
-                  }
-                };
-                _context3.next = 3;
-                return (0, _nodeFetch["default"])(this.url + 'workspaces', {
-                  credentials: 'include',
-                  method: 'POST',
-                  headers: {
-                    Authorization: this.auth,
-                    'Content-Type': 'application/json'
-                  },
-                  body: JSON.stringify(body)
-                });
-
-              case 3:
-                response = _context3.sent;
-
-                if (response.ok) {
-                  _context3.next = 13;
-                  break;
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              body = {
+                workspace: {
+                  name: name
                 }
-
-                _context3.next = 7;
-                return (0, _geoserver.getGeoServerResponseText)(response);
-
-              case 7:
-                geoServerResponse = _context3.sent;
-                _context3.t0 = response.status;
-                _context3.next = _context3.t0 === 409 ? 11 : 12;
+              };
+              _context3.next = 3;
+              return (0, _nodeFetch["default"])(this.url + 'workspaces', {
+                credentials: 'include',
+                method: 'POST',
+                headers: {
+                  Authorization: this.auth,
+                  'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(body)
+              });
+            case 3:
+              response = _context3.sent;
+              if (response.ok) {
+                _context3.next = 13;
                 break;
-
-              case 11:
-                throw new _geoserver.GeoServerResponseError('Unable to add workspace as it already exists', geoServerResponse);
-
-              case 12:
-                throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-
-              case 13:
-                return _context3.abrupt("return", response.text());
-
-              case 14:
-              case "end":
-                return _context3.stop();
-            }
+              }
+              _context3.next = 7;
+              return (0, _geoserver.getGeoServerResponseText)(response);
+            case 7:
+              geoServerResponse = _context3.sent;
+              _context3.t0 = response.status;
+              _context3.next = _context3.t0 === 409 ? 11 : 12;
+              break;
+            case 11:
+              throw new _geoserver.GeoServerResponseError('Unable to add workspace as it already exists', geoServerResponse);
+            case 12:
+              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+            case 13:
+              _context3.next = 15;
+              return this.get(name);
+            case 15:
+              wsObject = _context3.sent;
+              return _context3.abrupt("return", wsObject.workspace.name);
+            case 17:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3, this);
       }));
-
       function create(_x2) {
         return _create.apply(this, arguments);
       }
-
       return create;
     }()
     /**
@@ -255,67 +212,53 @@ var WorkspaceClient = /*#__PURE__*/function () {
      *
      * @throws Error if request fails
      */
-
   }, {
     key: "delete",
     value: function () {
       var _delete2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(name, recurse) {
         var response, geoServerResponse;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return (0, _nodeFetch["default"])(this.url + 'workspaces/' + name + '?recurse=' + recurse, {
-                  credentials: 'include',
-                  method: 'DELETE',
-                  headers: {
-                    Authorization: this.auth
-                  }
-                });
-
-              case 2:
-                response = _context4.sent;
-
-                if (response.ok) {
-                  _context4.next = 13;
-                  break;
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return (0, _nodeFetch["default"])(this.url + 'workspaces/' + name + '?recurse=' + recurse, {
+                credentials: 'include',
+                method: 'DELETE',
+                headers: {
+                  Authorization: this.auth
                 }
-
-                _context4.next = 6;
-                return (0, _geoserver.getGeoServerResponseText)(response);
-
-              case 6:
-                geoServerResponse = _context4.sent;
-                _context4.t0 = response.status;
-                _context4.next = _context4.t0 === 400 ? 10 : _context4.t0 === 404 ? 11 : 12;
+              });
+            case 2:
+              response = _context4.sent;
+              if (response.ok) {
+                _context4.next = 13;
                 break;
-
-              case 10:
-                throw new _geoserver.GeoServerResponseError('Workspace or related Namespace is not empty (and recurse not true)', geoServerResponse);
-
-              case 11:
-                throw new _geoserver.GeoServerResponseError('Workspace doesn\'t exist', geoServerResponse);
-
-              case 12:
-                throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-
-              case 13:
-              case "end":
-                return _context4.stop();
-            }
+              }
+              _context4.next = 6;
+              return (0, _geoserver.getGeoServerResponseText)(response);
+            case 6:
+              geoServerResponse = _context4.sent;
+              _context4.t0 = response.status;
+              _context4.next = _context4.t0 === 400 ? 10 : _context4.t0 === 404 ? 11 : 12;
+              break;
+            case 10:
+              throw new _geoserver.GeoServerResponseError('Workspace or related Namespace is not empty (and recurse not true)', geoServerResponse);
+            case 11:
+              throw new _geoserver.GeoServerResponseError('Workspace doesn\'t exist', geoServerResponse);
+            case 12:
+              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+            case 13:
+            case "end":
+              return _context4.stop();
           }
         }, _callee4, this);
       }));
-
       function _delete(_x3, _x4) {
         return _delete2.apply(this, arguments);
       }
-
       return _delete;
     }()
   }]);
   return WorkspaceClient;
 }();
-
 exports["default"] = WorkspaceClient;

package/geoserver-rest-client.js

@@ -8,6 +8,7 @@ import SettingsClient from './src/settings.js';
 import NamespaceClient from './src/namespace.js';
 import AboutClient from './src/about.js';
 import ResetReloadClient from './src/reset-reload.js';
+import LayerGroupClient from './src/layergroup.js';
 
 export { GeoServerResponseError } from './src/util/geoserver.js'
 
@@ -32,6 +33,8 @@ export class GeoServerRestClient {
 
     /** @member {LayerClient} layers GeoServer REST client instance for layers */
     this.layers = new LayerClient(this.url, this.auth);
+    /** @member {LayerGroupClient} layers GeoServer REST client instance for layergroups */
+    this.layergroups = new LayerGroupClient(this.url, this.auth);
     /** @member {StyleClient} styles GeoServer REST client instance for styles */
     this.styles = new StyleClient(this.url, this.auth);
     /** @member {WorkspaceClient} workspaces GeoServer REST client instance for workspaces */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geoserver-node-client",
-  "version": "1.2.4",
+  "version": "1.4.0",
   "description": "Node.js client for GeoServer REST API",
   "type": "module",
   "main": "geoserver-rest-client.js",
@@ -34,23 +34,22 @@
   "author": "C. Mayer, meggsimum (info_at*meggsimum?dot?de)",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "@babel/runtime": "^7.18.3",
-    "node-fetch": "^2.6.5"
+    "@babel/runtime": "^7.23.1",
+    "node-fetch": "^3.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.17.12",
-    "@babel/plugin-transform-runtime": "^7.18.0",
-    "@babel/preset-env": "^7.17.12",
-    "chai": "^4.3.4",
-    "eslint": "^7.32.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.25.2",
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.0",
+    "@babel/plugin-transform-runtime": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "chai": "^5.0.3",
+    "eslint": "^8.51.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "jsdoc": "^4.0.0",
-    "mocha": "^9.1.3",
-    "release-it": "^15.4.2"
+    "eslint-plugin-promise": "^6.1.1",
+    "jsdoc": "^4.0.2",
+    "mocha": "^10.2.0",
+    "release-it": "^17.0.3"
   }
 }

package/src/datastore.js

@@ -191,11 +191,32 @@ export default class DatastoreClient {
    * @returns {String} The successful response text
    */
   async createGeotiffFromFile (workspace, coverageStore, layerName, layerTitle, filePath) {
-    const lyrTitle = layerTitle || layerName;
     const stats = fs.statSync(filePath);
     const fileSizeInBytes = stats.size;
     const readStream = fs.createReadStream(filePath);
 
+    return this.createGeotiffFromStream(workspace, coverageStore, layerName, layerTitle, readStream, fileSizeInBytes);
+  }
+
+  /**
+   * Creates a GeoTIFF store from a file by stream and publishes it as layer.
+   * The GeoTIFF file is placed on the server, where your GeoServer
+   * is running.
+   *
+   * @param {String} workspace The workspace to create GeoTIFF store in
+   * @param {String} coverageStore The name of the new GeoTIFF store
+   * @param {String} layerName The published name of the new layer
+   * @param {String} layerTitle The published title of the new layer
+   * @param {Stream} readStream The stream of the GeoTIFF file
+   * @param {Number} fileSizeInBytes The number of bytes of the stream
+   *
+   * @throws Error if request fails
+   *
+   * @returns {String} The successful response text
+   */
+  async createGeotiffFromStream (workspace, coverageStore, layerName, layerTitle, readStream, fileSizeInBytes) {
+    const lyrTitle = layerTitle || layerName;
+
     let url = this.url + 'workspaces/' + workspace + '/coveragestores/' +
         coverageStore + '/file.geotiff';
     url += '?filename=' + lyrTitle + '&coverageName=' + layerName;