geoserver-node-client 1.6.1 → 1.6.2

package/dist/src/util/geoserver.js

@@ -1,24 +1,14 @@
 "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 _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
  * Utility functions and classes
  */
+
 /**
  * Return the GeoServer response text if available.
  *
@@ -26,47 +16,30 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  *
  * @returns {String} The response text if available
  */
-function getGeoServerResponseText(_x) {
-  return _getGeoServerResponseText.apply(this, arguments);
+async function getGeoServerResponseText(response) {
+  try {
+    return response.text();
+    // eslint-disable-next-line
+  } catch (e) {
+    // return nothing
+  }
 }
+
 /**
  * Generic GeoServer error
  */
-function _getGeoServerResponseText() {
-  _getGeoServerResponseText = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(response) {
-    var _t;
-    return _regenerator["default"].wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          return _context.abrupt("return", response.text());
-        case 1:
-          _context.prev = 1;
-          _t = _context["catch"](0);
-        case 2:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 1]]);
-  }));
-  return _getGeoServerResponseText.apply(this, arguments);
-}
-var GeoServerResponseError = exports.GeoServerResponseError = /*#__PURE__*/function (_Error) {
+class GeoServerResponseError extends Error {
   /**
    * @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 = _callSuper(this, GeoServerResponseError, [message]);
-    _this.name = 'GeoServerResponseError';
-    _this.message = message || 'GeoServer Response Error';
+  constructor(message, geoServerOutput) {
+    super(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.geoServerOutput = geoServerOutput;
-    return _this;
+    this.geoServerOutput = geoServerOutput;
   }
-  (0, _inherits2["default"])(GeoServerResponseError, _Error);
-  return (0, _createClass2["default"])(GeoServerResponseError);
-}(/*#__PURE__*/(0, _wrapNativeSuper2["default"])(Error));
+}
+exports.GeoServerResponseError = GeoServerResponseError;

package/dist/src/workspace.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,7 +13,7 @@ var _about = _interopRequireDefault(require("./about.js"));
  *
  * @module WorkspaceClient
  */
-var WorkspaceClient = exports["default"] = /*#__PURE__*/function () {
+class WorkspaceClient {
   /**
    * Creates a GeoServer REST WorkspaceClient instance.
    *
@@ -26,8 +22,7 @@ var WorkspaceClient = exports["default"] = /*#__PURE__*/function () {
    * @param {String} url The URL of the GeoServer REST API endpoint
    * @param {String} auth The Basic Authentication string
    */
-  function WorkspaceClient(url, auth) {
-    (0, _classCallCheck2["default"])(this, WorkspaceClient);
+  constructor(url, auth) {
     this.url = url;
     this.auth = auth;
   }
@@ -39,227 +34,119 @@ var WorkspaceClient = exports["default"] = /*#__PURE__*/function () {
    *
    * @returns {Object} An Object describing the workspaces
    */
-  return (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 (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'workspaces.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 + 'workspaces.json', {
+      credentials: 'include',
+      method: 'GET',
+      headers: {
+        Authorization: this.auth
       }
-      return getAll;
-    }()
-    /**
-     * Returns a workspace.
-     *
-     * @param {String} name Name of the workspace
-     *
-     * @throws Error if request fails
-     *
-     * @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 (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'workspaces/' + name + '.json', {
-                credentials: 'include',
-                method: 'GET',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context2.sent;
-              if (response.ok) {
-                _context2.next = 5;
-                break;
-              }
-              grc = new _about["default"](this.url, this.auth);
-              _context2.next = 2;
-              return grc.exists();
-            case 2:
-              if (!_context2.sent) {
-                _context2.next = 3;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 3:
-              _context2.next = 4;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 4:
-              geoServerResponse = _context2.sent;
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 5:
-              return _context2.abrupt("return", response.json());
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function get(_x) {
-        return _get.apply(this, arguments);
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+    }
+    return response.json();
+  }
+
+  /**
+   * Returns a workspace.
+   *
+   * @param {String} name Name of the workspace
+   *
+   * @throws Error if request fails
+   *
+   * @returns {Object} An object describing the workspaces
+   */
+  async get(name) {
+    const response = await (0, _nodeFetch.default)(this.url + 'workspaces/' + name + '.json', {
+      credentials: 'include',
+      method: 'GET',
+      headers: {
+        Authorization: this.auth
       }
-      return get;
-    }()
-    /**
-     * Creates a new workspace.
-     *
-     * @param {String} name Name of the new workspace
-     *
-     * @throws Error if request fails
-     *
-     * @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, wsObject, _t;
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              body = {
-                workspace: {
-                  name: name
-                }
-              };
-              _context3.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'workspaces', {
-                credentials: 'include',
-                method: 'POST',
-                headers: {
-                  Authorization: this.auth,
-                  'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(body)
-              });
-            case 1:
-              response = _context3.sent;
-              if (response.ok) {
-                _context3.next = 5;
-                break;
-              }
-              _context3.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context3.sent;
-              _t = response.status;
-              _context3.next = _t === 409 ? 3 : 4;
-              break;
-            case 3:
-              throw new _geoserver.GeoServerResponseError('Unable to add workspace as it already exists', geoServerResponse);
-            case 4:
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 5:
-              _context3.next = 6;
-              return this.get(name);
-            case 6:
-              wsObject = _context3.sent;
-              return _context3.abrupt("return", wsObject.workspace.name);
-            case 7:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function create(_x2) {
-        return _create.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 create;
-    }()
-    /**
-     * Deletes a workspace.
-     *
-     * @param {String} name Name of the workspace to delete
-     * @param {Boolean} recurse Flag to enable recursive deletion
-     *
-     * @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, _t2;
-        return _regenerator["default"].wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 1;
-              return (0, _nodeFetch["default"])(this.url + 'workspaces/' + name + '?recurse=' + recurse, {
-                credentials: 'include',
-                method: 'DELETE',
-                headers: {
-                  Authorization: this.auth
-                }
-              });
-            case 1:
-              response = _context4.sent;
-              if (response.ok) {
-                _context4.next = 6;
-                break;
-              }
-              _context4.next = 2;
-              return (0, _geoserver.getGeoServerResponseText)(response);
-            case 2:
-              geoServerResponse = _context4.sent;
-              _t2 = response.status;
-              _context4.next = _t2 === 400 ? 3 : _t2 === 404 ? 4 : 5;
-              break;
-            case 3:
-              throw new _geoserver.GeoServerResponseError('Workspace or related Namespace is not empty (and recurse not true)', geoServerResponse);
-            case 4:
-              throw new _geoserver.GeoServerResponseError("Workspace doesn't exist", geoServerResponse);
-            case 5:
-              throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
-            case 6:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function _delete(_x3, _x4) {
-        return _delete2.apply(this, arguments);
+    }
+    return response.json();
+  }
+
+  /**
+   * Creates a new workspace.
+   *
+   * @param {String} name Name of the new workspace
+   *
+   * @throws Error if request fails
+   *
+   * @returns {String} The name of the created workspace
+   */
+  async create(name) {
+    const body = {
+      workspace: {
+        name
       }
-      return _delete;
-    }())
-  }]);
-}();
+    };
+    const response = await (0, _nodeFetch.default)(this.url + 'workspaces', {
+      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);
+      switch (response.status) {
+        case 409:
+          throw new _geoserver.GeoServerResponseError('Unable to add workspace as it already exists', geoServerResponse);
+        default:
+          throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+      }
+    }
+    // query the WS object again to return the name of the created WS
+    const wsObject = await this.get(name);
+    return wsObject.workspace.name;
+  }
+
+  /**
+   * Deletes a workspace.
+   *
+   * @param {String} name Name of the workspace to delete
+   * @param {Boolean} recurse Flag to enable recursive deletion
+   *
+   * @throws Error if request fails
+   */
+  async delete(name, recurse) {
+    const response = await (0, _nodeFetch.default)(this.url + 'workspaces/' + name + '?recurse=' + recurse, {
+      credentials: 'include',
+      method: 'DELETE',
+      headers: {
+        Authorization: this.auth
+      }
+    });
+    if (!response.ok) {
+      const geoServerResponse = await (0, _geoserver.getGeoServerResponseText)(response);
+      switch (response.status) {
+        case 400:
+          // the docs say code 403, but apparently it is code 400
+          // https://docs.geoserver.org/latest/en/api/#1.0.0/workspaces.yaml
+          throw new _geoserver.GeoServerResponseError('Workspace or related Namespace is not empty (and recurse not true)', geoServerResponse);
+        case 404:
+          throw new _geoserver.GeoServerResponseError("Workspace doesn't exist", geoServerResponse);
+        default:
+          throw new _geoserver.GeoServerResponseError(null, geoServerResponse);
+      }
+    }
+  }
+}
+exports.default = WorkspaceClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geoserver-node-client",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Node.js client for GeoServer REST API",
   "type": "module",
   "main": "geoserver-rest-client.js",
@@ -36,14 +36,14 @@
   "author": "C. Mayer, meggsimum (info_at*meggsimum?dot?de)",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "@babel/runtime": "^7.27.6",
+    "@babel/runtime": "^8.0.0",
     "node-fetch": "^3.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.0",
-    "@babel/core": "^7.27.4",
-    "@babel/plugin-transform-runtime": "^7.27.4",
-    "@babel/preset-env": "^7.22.20",
+    "@babel/cli": "^8.0.0",
+    "@babel/core": "^8.0.0",
+    "@babel/plugin-transform-runtime": "^8.0.0",
+    "@babel/preset-env": "^8.0.0",
     "@eslint/compat": "^2.0.0",
     "chai": "^6.0.1",
     "eslint": "^9.29.0",
@@ -53,6 +53,6 @@
     "mocha": "^11.7.1",
     "neostandard": "^0.13.0",
     "prettier": "^3.6.1",
-    "release-it": "^19.0.3"
+    "release-it": "^20.0.0"
   }
 }