@lblod/mu-auth-sudo 1.0.0-beta.5 → 1.0.0

package/dist/auth-sudo.d.ts

@@ -1,4 +1,4 @@
-import { Response } from 'node-fetch';
+/// <reference types="node" />
 export interface ConnectionOptions {
     sparqlEndpoint?: string;
     authUser?: string;

package/dist/auth-sudo.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSudo = exports.querySudo = exports.HTTPResponseError = void 0;
 const express_http_context_1 = __importDefault(require("express-http-context"));
 const env_var_1 = __importDefault(require("env-var"));
-const node_fetch_1 = __importStar(require("node-fetch"));
 const digest_fetch_1 = __importDefault(require("digest-fetch"));
 const SPARQL_ENDPOINT = env_var_1.default.get('MU_SPARQL_ENDPOINT').required().asString();
 const LOG_SPARQL_ALL = env_var_1.default.get('LOG_SPARQL_ALL').required().asString();
@@ -43,6 +19,8 @@ const RETRY_FOR_HTTP_STATUS_CODES = env_var_1.default.get('SUDO_QUERY_RETRY_FOR_
 const RETRY_FOR_CONNECTION_ERRORS = env_var_1.default.get('SUDO_QUERY_RETRY_FOR_CONNECTION_ERRORS').default('ECONNRESET,ETIMEDOUT,EAI_AGAIN').asArray();
 const RETRY_TIMEOUT_INCREMENT_FACTOR = env_var_1.default.get('SUDO_QUERY_RETRY_TIMEOUT_INCREMENT_FACTOR').default('0.3').asFloat();
 class HTTPResponseError extends Error {
+    httpStatus;
+    httpStatusText;
     constructor(response) {
         super(`HTTP Error Response: ${response.status} ${response.statusText}`);
         this.httpStatus = response.status;
@@ -51,7 +29,7 @@ class HTTPResponseError extends Error {
 }
 exports.HTTPResponseError = HTTPResponseError;
 function defaultHeaders() {
-    const headers = new node_fetch_1.Headers();
+    const headers = new Headers();
     headers.set('content-type', 'application/x-www-form-urlencoded');
     headers.set('mu-auth-sudo', 'true');
     headers.set('Accept', 'application/sparql-results+json');
@@ -82,6 +60,9 @@ async function executeRawQuery(queryString, extraHeaders = {}, connectionOptions
         let response;
         if (connectionOptions.authUser && connectionOptions.authPassword) {
             const client = new digest_fetch_1.default(connectionOptions.authUser, connectionOptions.authPassword, { basic: connectionOptions.authType === 'basic' });
+            // the cast fixes a weird inconsistency between digest-fetch's declared return type
+            // it declares it either returns the browser's version of Response or node-fetch's, and 
+            // I think those are slightly different from the real Response type in node
             response = await client.fetch(sparqlEndpoint, {
                 method: 'POST',
                 body: formData.toString(),
@@ -89,7 +70,7 @@ async function executeRawQuery(queryString, extraHeaders = {}, connectionOptions
             });
         }
         else {
-            response = await (0, node_fetch_1.default)(sparqlEndpoint, {
+            response = await fetch(sparqlEndpoint, {
                 method: 'POST',
                 body: formData.toString(),
                 headers
@@ -141,20 +122,20 @@ function updateSudo(queryString, extraHeaders = {}, connectionOptions = {}) {
 exports.updateSudo = updateSudo;
 function mayRetry(error, attempt, connectionOptions = {}) {
     console.log(`Checking retry allowed for error: ${error} and attempt: ${attempt}`);
-    let mayRetry = false;
+    let shouldRetry = false;
     if (!(RETRY || connectionOptions.mayRetry)) {
-        mayRetry = false;
+        shouldRetry = false;
     }
     else if (attempt < RETRY_MAX_ATTEMPTS) {
         if (error.code && RETRY_FOR_CONNECTION_ERRORS.includes(error.code)) {
-            mayRetry = true;
+            shouldRetry = true;
         }
         else if (error.httpStatus && RETRY_FOR_HTTP_STATUS_CODES.includes(`${error.httpStatus}`)) {
-            mayRetry = true;
+            shouldRetry = true;
         }
     }
-    console.log(`Retry allowed? ${mayRetry}`);
-    return mayRetry;
+    console.log(`Retry allowed? ${shouldRetry}`);
+    return shouldRetry;
 }
 function nextAttemptTimeout(attempt) {
     // expected to be milliseconds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/mu-auth-sudo",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0",
   "description": "this package provides an alternative sparql client for the mu-javascript-template that has sudo rights.",
   "main": "dist/auth-sudo.js",
   "types": "dist/auth-sudo.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/lblod/mu-auth-sudo#readme",
   "devDependencies": {
-    "@types/node-fetch": "^2.6.2",
+    "@types/node": "^25.0.9",
     "express-http-context": "^1.2.4",
     "prettier": "^2.7.1",
     "release-it": "^15.5.0",
@@ -36,9 +36,8 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "digest-fetch": "^1.3.0",
-    "env-var": "^7.0.1",
-    "node-fetch": "^2.6.7"
+    "digest-fetch": "^3.1.1",
+    "env-var": "^7.0.1"
   },
   "peerDependencies": {
     "express-http-context": "~1.2.4"