geoserver-node-client 1.6.0 → 1.6.2

package/dist/src/namespace.js

@@ -1,14 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 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"));
+exports.default = void 0;
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _geoserver = require("./util/geoserver.js");
 var _about = _interopRequireDefault(require("./about.js"));
@@ -17,15 +13,14 @@ var _about = _interopRequireDefault(require("./about.js"));
  *
  * @module NamespaceClient
  */
-var NamespaceClient = exports["default"] = /*#__PURE__*/function () {
+class NamespaceClient {
   /**
    * Creates a GeoServer REST NamespaceClient instance.
    *
    * @param {String} url The URL of the GeoServer REST API endpoint
    * @param {String} auth The Basic Authentication string
    */
-  function NamespaceClient(url, auth) {
-    (0, _classCallCheck2["default"])(this, NamespaceClient);
+  constructor(url, auth) {
     this.url = url;
     this.auth = auth;
   }
@@ -37,220 +32,113 @@ var NamespaceClient = exports["default"] = /*#__PURE__*/function () {
    *
    * @returns {Object} An object describing the namespace
    */
-  return (0, _createClass2["default"])(NamespaceClient, [{
-    key: "getAll",
-    value: (function () {
-      var _getAll = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var response, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'namespaces.json', {
-                credentials: 'include',
-                method: 'GET',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context.sent;
-              if (response.ok) {
-                _context.next = 3;
-                break;
-              }
-              _context.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 3:
-              return _context.abrupt("return", response.json());
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function getAll() {
-        return _getAll.apply(this, arguments);
+  async getAll() {
+    const response = await (0, _nodeFetch.default)(this.url + 'namespaces.json', {
+      credentials: 'include',
+      method: 'GET',
+      headers: {
+        Authorization: this.auth
       }
-      return getAll;
-    }()
-    /**
-     * Creates a new namespace.
-     *
-     * @param {String} prefix Prefix of the new namespace
-     * @param {String} uri Uri of the new namespace
-     *
-     * @throws Error if request fails
-     *
-     * @returns {String} The name of the created namespace
-     */
-    )
-  }, {
-    key: "create",
-    value: (function () {
-      var _create = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(prefix, uri) {
-        var body, response, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              body = {
-                namespace: {
-                  prefix: prefix,
-                  uri: uri
-                }
-              };
-              _context2.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'namespaces', {
-                credentials: 'include',
-                method: 'POST',
-                headers: {
-                  Authorization: this.auth,
-                  'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(body)
-              });
-            case 1:
-              response = _context2.sent;
-              if (response.ok) {
-                _context2.next = 3;
-                break;
-              }
-              _context2.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context2.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 3:
-              return _context2.abrupt("return", response.text());
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function create(_x, _x2) {
-        return _create.apply(this, arguments);
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+    }
+    return response.json();
+  }
+
+  /**
+   * Creates a new namespace.
+   *
+   * @param {String} prefix Prefix of the new namespace
+   * @param {String} uri Uri of the new namespace
+   *
+   * @throws Error if request fails
+   *
+   * @returns {String} The name of the created namespace
+   */
+  async create(prefix, uri) {
+    const body = {
+      namespace: {
+        prefix: prefix,
+        uri: uri
+      }
+    };
+    const response = await (0, _nodeFetch.default)(this.url + 'namespaces', {
+      credentials: 'include',
+      method: 'POST',
+      headers: {
+        Authorization: this.auth,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(body)
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+    }
+    return response.text();
+  }
+
+  /**
+   * Returns a namespace.
+   *
+   * @param {String} name Name of the namespace
+   *
+   * @throws Error if request fails
+   *
+   * @returns {Object} An object describing the namespace or undefined if it cannot be found
+   */
+  async get(name) {
+    const response = await (0, _nodeFetch.default)(this.url + 'namespaces/' + name + '.json', {
+      credentials: 'include',
+      method: 'GET',
+      headers: {
+        Authorization: this.auth
       }
-      return create;
-    }()
-    /**
-     * Returns a namespace.
-     *
-     * @param {String} name Name of the namespace
-     *
-     * @throws Error if request fails
-     *
-     * @returns {Object} An object describing the namespace or undefined if it cannot be found
-     */
-    )
-  }, {
-    key: "get",
-    value: (function () {
-      var _get = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(name) {
-        var response, grc, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'namespaces/' + name + '.json', {
-                credentials: 'include',
-                method: 'GET',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context3.sent;
-              if (response.ok) {
-                _context3.next = 5;
-                break;
-              }
-              grc = new _about["default"](this.url, this.auth);
-              _context3.next = 2;
-              return grc.exists();
-            case 2:
-              if (!_context3.sent) {
-                _context3.next = 3;
-                break;
-              }
-              return _context3.abrupt("return");
-            case 3:
-              _context3.next = 4;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 4:
-              geoServerResponse = _context3.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 5:
-              return _context3.abrupt("return", response.json());
-            case 6:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function get(_x3) {
-        return _get.apply(this, arguments);
+    });
+    if (!response.ok) {
+      const grc = new _about.default(this.url, this.auth);
+      if (await grc.exists()) {
+        // GeoServer exists, but requested item does not exist,  we return empty
+        return;
+      } else {
+        // There was a general problem with GeoServer
+        const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+        throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
       }
-      return get;
-    }()
-    /**
-     * Deletes a namespace.
-     *
-     * @param {String} name Name of the namespace to delete
-     *
-     * @throws Error if request fails
-     */
-    )
-  }, {
-    key: "delete",
-    value: (function () {
-      var _delete2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(name) {
-        var response, geoServerResponse, _t;
-        return _regenerator["default"].wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'namespaces/' + name, {
-                credentials: 'include',
-                method: 'DELETE',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context4.sent;
-              if (response.ok) {
-                _context4.next = 7;
-                break;
-              }
-              _context4.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context4.sent;
-              _t = response.status;
-              _context4.next = _t === 403 ? 3 : _t === 404 ? 4 : _t === 405 ? 5 : 6;
-              break;
-            case 3:
-              throw new _geoserver.GeoServerResponseError('Namespace or related Workspace is not empty (and recurse not true)', geoServerResponse);
-            case 4:
-              throw new _geoserver.GeoServerResponseError("Namespace doesn't exist", geoServerResponse);
-            case 5:
-              throw new _geoserver.GeoServerResponseError("Can't delete default namespace", geoServerResponse);
-            case 6:
-              throw new _geoserver.GeoServerResponseError('Response not recognized', geoServerResponse);
-            case 7:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function _delete(_x4) {
-        return _delete2.apply(this, arguments);
+    }
+    return response.json();
+  }
+
+  /**
+   * Deletes a namespace.
+   *
+   * @param {String} name Name of the namespace to delete
+   *
+   * @throws Error if request fails
+   */
+  async delete(name) {
+    const response = await (0, _nodeFetch.default)(this.url + 'namespaces/' + name, {
+      credentials: 'include',
+      method: 'DELETE',
+      headers: {
+        Authorization: this.auth
+      }
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      switch (response.status) {
+        case 403:
+          throw new _geoserver.GeoServerResponseError('Namespace or related Workspace is not empty (and recurse not true)', geoServerResponse);
+        case 404:
+          throw new _geoserver.GeoServerResponseError("Namespace doesn't exist", geoServerResponse);
+        case 405:
+          throw new _geoserver.GeoServerResponseError("Can't delete default namespace", geoServerResponse);
+        default:
+          throw new _geoserver.GeoServerResponseError('Response not recognized', geoServerResponse);
       }
-      return _delete;
-    }())
-  }]);
-}();
+    }
+  }
+}
+exports.default = NamespaceClient;

package/dist/src/reset-reload.js

@@ -1,14 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 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"));
+exports.default = void 0;
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _geoserver = require("./util/geoserver.js");
 /**
@@ -17,15 +13,14 @@ var _geoserver = require("./util/geoserver.js");
  *
  * @module ResetReloadClient
  */
-var ResetReloadClient = exports["default"] = /*#__PURE__*/function () {
+class ResetReloadClient {
   /**
    * Creates a GeoServer REST ResetReloadClient instance.
    *
    * @param {String} url The URL of the GeoServer REST API endpoint
    * @param {String} auth The Basic Authentication string
    */
-  function ResetReloadClient(url, auth) {
-    (0, _classCallCheck2["default"])(this, ResetReloadClient);
+  constructor(url, auth) {
     this.url = url;
     this.auth = auth;
   }
@@ -39,92 +34,42 @@ var ResetReloadClient = exports["default"] = /*#__PURE__*/function () {
    *
    * @throws Error if request fails
    */
-  return (0, _createClass2["default"])(ResetReloadClient, [{
-    key: "reset",
-    value: (function () {
-      var _reset = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var url, response, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              url = this.url + 'reset';
-              _context.next = 1;
-              return (0, _nodeFetch["default"])(url, {
-                credentials: 'include',
-                method: 'POST',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context.sent;
-              if (response.ok) {
-                _context.next = 3;
-                break;
-              }
-              _context.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function reset() {
-        return _reset.apply(this, arguments);
+  async reset() {
+    const url = this.url + 'reset';
+    const response = await (0, _nodeFetch.default)(url, {
+      credentials: 'include',
+      method: 'POST',
+      headers: {
+        Authorization: this.auth
       }
-      return reset;
-    }()
-    /**
-     * Reloads the GeoServer catalog and configuration from disk. This operation
-     * is used in cases where an external tool has modified the on-disk
-     * configuration. This operation will also force GeoServer to drop any
-     * internal caches and reconnect to all data stores.
-     *
-     * @throws Error if request fails
-     */
-    )
-  }, {
-    key: "reload",
-    value: (function () {
-      var _reload = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var url, response, geoServerResponse;
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              url = this.url + 'reload';
-              _context2.next = 1;
-              return (0, _nodeFetch["default"])(url, {
-                credentials: 'include',
-                method: 'POST',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context2.sent;
-              if (response.ok) {
-                _context2.next = 3;
-                break;
-              }
-              _context2.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context2.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function reload() {
-        return _reload.apply(this, arguments);
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+    }
+  }
+
+  /**
+   * Reloads the GeoServer catalog and configuration from disk. This operation
+   * is used in cases where an external tool has modified the on-disk
+   * configuration. This operation will also force GeoServer to drop any
+   * internal caches and reconnect to all data stores.
+   *
+   * @throws Error if request fails
+   */
+  async reload() {
+    const url = this.url + 'reload';
+    const response = await (0, _nodeFetch.default)(url, {
+      credentials: 'include',
+      method: 'POST',
+      headers: {
+        Authorization: this.auth
       }
-      return reload;
-    }())
-  }]);
-}();
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+    }
+  }
+}
+exports.default = ResetReloadClient;