@lblod/mu-auth-sudo 1.0.0-beta.2 → 1.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth-sudo.js +24 -3
- package/package.json +1 -1
package/dist/auth-sudo.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.updateSudo = exports.querySudo = void 0;
|
|
29
|
+
exports.updateSudo = exports.querySudo = exports.HTTPResponseError = void 0;
|
|
30
30
|
const express_http_context_1 = __importDefault(require("express-http-context"));
|
|
31
31
|
const env_var_1 = __importDefault(require("env-var"));
|
|
32
32
|
const node_fetch_1 = __importStar(require("node-fetch"));
|
|
@@ -42,6 +42,14 @@ const RETRY_MAX_ATTEMPTS = env_var_1.default.get('SUDO_QUERY_RETRY_MAX_ATTEMPTS'
|
|
|
42
42
|
const RETRY_FOR_HTTP_STATUS_CODES = env_var_1.default.get('SUDO_QUERY_RETRY_FOR_HTTP_STATUS_CODES').default('').asArray();
|
|
43
43
|
const RETRY_FOR_CONNECTION_ERRORS = env_var_1.default.get('SUDO_QUERY_RETRY_FOR_CONNECTION_ERRORS').default('ECONNRESET,ETIMEDOUT,EAI_AGAIN').asArray();
|
|
44
44
|
const RETRY_TIMEOUT_INCREMENT_FACTOR = env_var_1.default.get('SUDO_QUERY_RETRY_TIMEOUT_INCREMENT_FACTOR').default('0.3').asFloat();
|
|
45
|
+
class HTTPResponseError extends Error {
|
|
46
|
+
constructor(response) {
|
|
47
|
+
super(`HTTP Error Response: ${response.status} ${response.statusText}`);
|
|
48
|
+
this.httpStatus = response.status;
|
|
49
|
+
this.httpStatusText = response.statusText;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
exports.HTTPResponseError = HTTPResponseError;
|
|
45
53
|
function defaultHeaders() {
|
|
46
54
|
const headers = new node_fetch_1.Headers();
|
|
47
55
|
headers.set('content-type', 'application/x-www-form-urlencoded');
|
|
@@ -61,7 +69,7 @@ async function executeRawQuery(queryString, extraHeaders = {}, connectionOptions
|
|
|
61
69
|
}
|
|
62
70
|
if (DEBUG_AUTH_HEADERS) {
|
|
63
71
|
const stringifiedHeaders = Array.from(headers.entries())
|
|
64
|
-
.filter(([key
|
|
72
|
+
.filter(([key]) => key.startsWith('mu-'))
|
|
65
73
|
.map(([key, value]) => `${key}: ${value}`)
|
|
66
74
|
.join("\n");
|
|
67
75
|
console.log(`Headers set on SPARQL client: ${stringifiedHeaders}`);
|
|
@@ -87,7 +95,12 @@ async function executeRawQuery(queryString, extraHeaders = {}, connectionOptions
|
|
|
87
95
|
headers
|
|
88
96
|
});
|
|
89
97
|
}
|
|
90
|
-
|
|
98
|
+
if (response.ok) {
|
|
99
|
+
return await maybeJSON(response);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
throw new HTTPResponseError(response);
|
|
103
|
+
}
|
|
91
104
|
}
|
|
92
105
|
catch (ex) {
|
|
93
106
|
if (mayRetry(ex, attempt, connectionOptions)) {
|
|
@@ -104,6 +117,14 @@ async function executeRawQuery(queryString, extraHeaders = {}, connectionOptions
|
|
|
104
117
|
}
|
|
105
118
|
}
|
|
106
119
|
}
|
|
120
|
+
async function maybeJSON(response) {
|
|
121
|
+
try {
|
|
122
|
+
return (await response.json());
|
|
123
|
+
}
|
|
124
|
+
catch (e) {
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
107
128
|
function querySudo(queryString, extraHeaders = {}, connectionOptions = {}) {
|
|
108
129
|
if (LOG_SPARQL_QUERIES) {
|
|
109
130
|
console.log(queryString);
|
package/package.json
CHANGED