@mapcreator/api 5.0.0-alpha.41 → 5.0.0-alpha.43
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.
Potentially problematic release.
This version of @mapcreator/api might be problematic. Click here for more details.
- package/cjs/api/jobRevision.d.ts +3 -10
- package/cjs/api/jobRevision.d.ts.map +1 -1
- package/cjs/api/jobRevision.js +7 -53
- package/cjs/api/jobRevision.js.map +1 -1
- package/cjs/oauth.d.ts +1 -8
- package/cjs/oauth.d.ts.map +1 -1
- package/cjs/oauth.js +4 -210
- package/cjs/oauth.js.map +1 -1
- package/cjs/utils.d.ts.map +1 -1
- package/cjs/utils.js +6 -5
- package/cjs/utils.js.map +1 -1
- package/esm/api/jobRevision.d.ts +3 -10
- package/esm/api/jobRevision.d.ts.map +1 -1
- package/esm/api/jobRevision.js +7 -52
- package/esm/api/jobRevision.js.map +1 -1
- package/esm/oauth.d.ts +1 -8
- package/esm/oauth.d.ts.map +1 -1
- package/esm/oauth.js +5 -210
- package/esm/oauth.js.map +1 -1
- package/esm/utils.d.ts.map +1 -1
- package/esm/utils.js +7 -6
- package/esm/utils.js.map +1 -1
- package/package.json +1 -1
- package/src/api/jobRevision.ts +13 -72
- package/src/oauth.ts +5 -275
- package/src/utils.ts +10 -4
package/cjs/api/jobRevision.d.ts
CHANGED
|
@@ -61,16 +61,9 @@ export declare const jobRevisionBuildRevivers: Revivers<ApiJobRevisionBuild, Job
|
|
|
61
61
|
export declare function registerJobRevisionBuild(jobId: number, status: string, start: Date, end: Date): Promise<JobRevisionBuild>;
|
|
62
62
|
export declare function cloneJobRevision(jobId: number, newTitle?: string): Promise<JobRevision>;
|
|
63
63
|
export declare function listJobRevisionLayers(jobId: number): Promise<Layer[]>;
|
|
64
|
-
|
|
64
|
+
type OutputUrl = {
|
|
65
65
|
url: string;
|
|
66
66
|
};
|
|
67
|
-
export
|
|
68
|
-
|
|
69
|
-
} & Omit<ApiSuccess, 'data'> | ApiError;
|
|
70
|
-
export declare function getJobRevisionOutputUrl(jobId: number): Promise<JobRevisionOutputUrl>;
|
|
71
|
-
export type JobRevisionOutput = {
|
|
72
|
-
blob: Blob;
|
|
73
|
-
filename?: string | undefined;
|
|
74
|
-
};
|
|
75
|
-
export declare function getJobRevisionOutput(jobId: number): Promise<JobRevisionOutput>;
|
|
67
|
+
export declare function getOutputUrl(jobId: number): Promise<OutputUrl>;
|
|
68
|
+
export {};
|
|
76
69
|
//# sourceMappingURL=jobRevision.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobRevision.d.ts","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,KAAK,EAAiB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"jobRevision.d.ts","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"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"}
|
package/cjs/api/jobRevision.js
CHANGED
|
@@ -8,10 +8,8 @@ exports.getJobRevisionBuild = getJobRevisionBuild;
|
|
|
8
8
|
exports.registerJobRevisionBuild = registerJobRevisionBuild;
|
|
9
9
|
exports.cloneJobRevision = cloneJobRevision;
|
|
10
10
|
exports.listJobRevisionLayers = listJobRevisionLayers;
|
|
11
|
-
exports.
|
|
12
|
-
exports.getJobRevisionOutput = getJobRevisionOutput;
|
|
11
|
+
exports.getOutputUrl = getOutputUrl;
|
|
13
12
|
const layer_js_1 = require("./layer.js");
|
|
14
|
-
const oauth_js_1 = require("../oauth.js");
|
|
15
13
|
const utils_js_1 = require("../utils.js");
|
|
16
14
|
exports.jobRevisionRevivers = {
|
|
17
15
|
archived: undefined,
|
|
@@ -74,58 +72,14 @@ async function listJobRevisionLayers(jobId) {
|
|
|
74
72
|
const options = { revivers: layer_js_1.layerRevivers };
|
|
75
73
|
return (0, utils_js_1.request)(path, null, utils_js_1.defaultListHeader, options);
|
|
76
74
|
}
|
|
77
|
-
async function
|
|
78
|
-
await createJobRevisionBuild(jobId);
|
|
79
|
-
const path = `/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/result/output-url`;
|
|
80
|
-
return (0, utils_js_1.request)(path);
|
|
81
|
-
}
|
|
82
|
-
async function getJobRevisionOutput(jobId) {
|
|
83
|
-
await createJobRevisionBuild(jobId);
|
|
84
|
-
const href = `${oauth_js_1.apiHost}/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/result/output`;
|
|
85
|
-
const response = await fetch(href).catch((error) => {
|
|
86
|
-
var _a;
|
|
87
|
-
throw new utils_js_1.NetworkError((_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error);
|
|
88
|
-
});
|
|
89
|
-
if (response.ok) {
|
|
90
|
-
const blob = await response.blob().catch(() => {
|
|
91
|
-
throw new utils_js_1.APIError({ success: false, error: { type: 'TypeError', message: 'Malformed Blob response' } });
|
|
92
|
-
});
|
|
93
|
-
const contentDisposition = response.headers.get('Content-Disposition');
|
|
94
|
-
if (contentDisposition) {
|
|
95
|
-
const filenameRegex = /filename\*\s*=\s*UTF-8''(.+)/i;
|
|
96
|
-
const filenameMatch = contentDisposition.match(filenameRegex);
|
|
97
|
-
if (filenameMatch === null || filenameMatch === void 0 ? void 0 : filenameMatch[1]) {
|
|
98
|
-
return { blob, filename: filenameMatch[1] };
|
|
99
|
-
}
|
|
100
|
-
const fallbackRegex = /filename\s*=\s*"([^"]+)"/i;
|
|
101
|
-
const fallbackMatch = contentDisposition.match(fallbackRegex);
|
|
102
|
-
if (fallbackMatch === null || fallbackMatch === void 0 ? void 0 : fallbackMatch[1]) {
|
|
103
|
-
return { blob, filename: fallbackMatch[1] };
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
return { blob };
|
|
107
|
-
}
|
|
108
|
-
else {
|
|
109
|
-
// eslint-disable-next-line default-case
|
|
110
|
-
switch (response.status) {
|
|
111
|
-
case 401:
|
|
112
|
-
await (0, oauth_js_1.authenticate)();
|
|
113
|
-
break; // NO-OP
|
|
114
|
-
case 403:
|
|
115
|
-
case 404:
|
|
116
|
-
case 406:
|
|
117
|
-
case 429:
|
|
118
|
-
throw new utils_js_1.APIError((await response.json().catch(() => ({
|
|
119
|
-
success: false,
|
|
120
|
-
error: { type: 'HttpException', message: response.statusText },
|
|
121
|
-
}))));
|
|
122
|
-
}
|
|
123
|
-
throw new utils_js_1.HTTPError(response);
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
async function createJobRevisionBuild(jobId) {
|
|
75
|
+
async function postJobRevisionBuild(jobId) {
|
|
127
76
|
const pathname = `/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/build`;
|
|
128
77
|
const path = `${pathname}?${utils_js_1.deletedNoneParam}`;
|
|
129
78
|
return (0, utils_js_1.request)(path, null, null, { method: 'POST' });
|
|
130
79
|
}
|
|
80
|
+
async function getOutputUrl(jobId) {
|
|
81
|
+
const path = `/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/result/output-url`;
|
|
82
|
+
await postJobRevisionBuild(jobId);
|
|
83
|
+
return (0, utils_js_1.request)(path);
|
|
84
|
+
}
|
|
131
85
|
//# sourceMappingURL=jobRevision.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobRevision.js","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"jobRevision.js","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"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"}
|
package/cjs/oauth.d.ts
CHANGED
|
@@ -1,17 +1,10 @@
|
|
|
1
1
|
export declare let apiHost: string;
|
|
2
|
-
export declare
|
|
2
|
+
export declare const token: {
|
|
3
3
|
type: string;
|
|
4
4
|
token: string;
|
|
5
5
|
expires: Date;
|
|
6
6
|
toString: () => string;
|
|
7
7
|
} | null;
|
|
8
|
-
/**
|
|
9
|
-
* Setup internal structures to use dummy authentication flow
|
|
10
|
-
*
|
|
11
|
-
* @param {string} apiUrl - Full API URL
|
|
12
|
-
* @param {string} oauthToken - OAuth Token
|
|
13
|
-
*/
|
|
14
|
-
export declare function initDummyFlow(apiUrl: string, oauthToken: string): void;
|
|
15
8
|
/**
|
|
16
9
|
* Setup internal structures to use implicit authentication flow
|
|
17
10
|
*
|
package/cjs/oauth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"AACA,eAAO,IAAI,OAAO,QAAK,CAAC;AAExB,eAAO,MAAM,KAAK,EAAE;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,IAAI,CAAC;IAEd,QAAQ,EAAE,MAAM,MAAM,CAAC;CACxB,GAAG,IAAW,CAAC;AAMhB;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,SAAK,EAAE,MAAM,WAAQ,GAAG,IAAI,CAMzG;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,CAI5D;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE5C"}
|
package/cjs/oauth.js
CHANGED
|
@@ -1,40 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.token = exports.apiHost = void 0;
|
|
4
|
-
exports.initDummyFlow = initDummyFlow;
|
|
5
4
|
exports.initImplicitFlow = initImplicitFlow;
|
|
6
5
|
exports.authenticate = authenticate;
|
|
7
6
|
exports.authenticated = authenticated;
|
|
8
7
|
exports.logout = logout;
|
|
8
|
+
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
9
9
|
exports.apiHost = '';
|
|
10
10
|
exports.token = null;
|
|
11
11
|
let apiClientId = '';
|
|
12
12
|
let callbackUrl = '';
|
|
13
13
|
let oauthScopes = ['*'];
|
|
14
|
-
const anchorParams = ['access_token', 'token_type', 'expires_in', 'state'];
|
|
15
|
-
const storagePrefix = '_m4n_';
|
|
16
|
-
const statePrefix = 'oauth_state_';
|
|
17
|
-
const storageName = 'api_token';
|
|
18
|
-
const dummyTokenExpires = new Date('2100-01-01T01:00:00');
|
|
19
|
-
const titleCase = (str) => String(str).toLowerCase().replace(/\b\w/g, c => c.toUpperCase());
|
|
20
|
-
/**
|
|
21
|
-
* Setup internal structures to use dummy authentication flow
|
|
22
|
-
*
|
|
23
|
-
* @param {string} apiUrl - Full API URL
|
|
24
|
-
* @param {string} oauthToken - OAuth Token
|
|
25
|
-
*/
|
|
26
|
-
function initDummyFlow(apiUrl, oauthToken) {
|
|
27
|
-
const parts = oauthToken.includes(' ') ? oauthToken.split(' ', 2) : ['Bearer', oauthToken];
|
|
28
|
-
exports.apiHost = apiUrl.replace(/\/+$/, '');
|
|
29
|
-
exports.token = {
|
|
30
|
-
type: titleCase(parts[0]),
|
|
31
|
-
token: parts[1],
|
|
32
|
-
expires: dummyTokenExpires,
|
|
33
|
-
toString() {
|
|
34
|
-
return `${this.type} ${this.token}`;
|
|
35
|
-
},
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
14
|
/**
|
|
39
15
|
* Setup internal structures to use implicit authentication flow
|
|
40
16
|
*
|
|
@@ -48,198 +24,16 @@ function initImplicitFlow(apiUrl, clientId, redirectUrl = '', scopes = ['*']) {
|
|
|
48
24
|
apiClientId = String(clientId);
|
|
49
25
|
callbackUrl = String(redirectUrl || window.location.href.split('#')[0]);
|
|
50
26
|
oauthScopes = scopes;
|
|
51
|
-
{
|
|
52
|
-
const key = `${storagePrefix}${storageName}`;
|
|
53
|
-
const data = window.localStorage.getItem(key);
|
|
54
|
-
if (data) {
|
|
55
|
-
try {
|
|
56
|
-
const obj = JSON.parse(data);
|
|
57
|
-
if (typeof obj.type === 'string' &&
|
|
58
|
-
typeof obj.token === 'string' &&
|
|
59
|
-
typeof obj.expires === 'string' &&
|
|
60
|
-
new Date(obj.expires) > new Date()) {
|
|
61
|
-
exports.token = {
|
|
62
|
-
type: titleCase(obj.type),
|
|
63
|
-
token: obj.token,
|
|
64
|
-
expires: new Date(obj.expires),
|
|
65
|
-
toString() {
|
|
66
|
-
return `${this.type} ${this.token}`;
|
|
67
|
-
},
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
window.localStorage.removeItem(key);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
catch (e) {
|
|
75
|
-
/* */
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
{
|
|
80
|
-
const obj = getAnchorToken();
|
|
81
|
-
if (isAnchorToken(obj)) {
|
|
82
|
-
// We'll not go there if anchor contains error and/or message
|
|
83
|
-
// This means that anchor parameters will be preserved for the next processing
|
|
84
|
-
cleanAnchorParams();
|
|
85
|
-
const expires = new Date(Date.now() + Number(obj.expires_in) * 1000);
|
|
86
|
-
if (isValidState(obj.state) && expires > new Date()) {
|
|
87
|
-
exports.token = {
|
|
88
|
-
type: titleCase(obj.token_type),
|
|
89
|
-
token: obj.access_token,
|
|
90
|
-
expires,
|
|
91
|
-
toString() {
|
|
92
|
-
return `${this.type} ${this.token}`;
|
|
93
|
-
},
|
|
94
|
-
};
|
|
95
|
-
const key = `${storagePrefix}${storageName}`;
|
|
96
|
-
const data = { type: exports.token.type, token: exports.token.token, expires: expires.toUTCString() };
|
|
97
|
-
window.localStorage.setItem(key, JSON.stringify(data));
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
// TODO: add some logic to handle this
|
|
101
|
-
// throw Error('Invalid state in url');
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
if (authenticated()) {
|
|
106
|
-
const href = sessionStorage.getItem('redirect-url');
|
|
107
|
-
if (href) {
|
|
108
|
-
sessionStorage.removeItem('redirect-url');
|
|
109
|
-
window.history.replaceState(null, document.title, href);
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
27
|
}
|
|
113
28
|
async function authenticate() {
|
|
114
29
|
return new Promise(() => {
|
|
115
|
-
|
|
116
|
-
console.error(getError());
|
|
117
|
-
cleanAnchorParams();
|
|
118
|
-
}
|
|
119
|
-
forget();
|
|
120
|
-
sessionStorage.setItem('redirect-url', window.location.href);
|
|
121
|
-
window.location.assign(buildRedirectUrl());
|
|
30
|
+
window.location.assign(`${exports.apiHost}/login`);
|
|
122
31
|
});
|
|
123
32
|
}
|
|
124
33
|
function authenticated() {
|
|
125
|
-
return
|
|
126
|
-
!!window.localStorage.getItem(`${storagePrefix}${storageName}`));
|
|
34
|
+
return true;
|
|
127
35
|
}
|
|
128
36
|
async function logout() {
|
|
129
|
-
|
|
130
|
-
await fetch(`${exports.apiHost}/oauth/logout`, {
|
|
131
|
-
method: 'POST',
|
|
132
|
-
headers: {
|
|
133
|
-
Accept: 'application/json',
|
|
134
|
-
Authorization: exports.token.toString(),
|
|
135
|
-
},
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
forget();
|
|
139
|
-
}
|
|
140
|
-
function forget() {
|
|
141
|
-
for (let i = 0; i < window.localStorage.length; ++i) {
|
|
142
|
-
const key = window.localStorage.key(i);
|
|
143
|
-
if (key === null || key === void 0 ? void 0 : key.startsWith(storagePrefix)) {
|
|
144
|
-
window.localStorage.removeItem(key);
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
exports.token = null;
|
|
148
|
-
}
|
|
149
|
-
function buildRedirectUrl() {
|
|
150
|
-
const queryParams = new URLSearchParams({
|
|
151
|
-
client_id: apiClientId,
|
|
152
|
-
redirect_uri: callbackUrl,
|
|
153
|
-
response_type: 'token',
|
|
154
|
-
scope: oauthScopes.join(' '),
|
|
155
|
-
state: generateState(),
|
|
156
|
-
});
|
|
157
|
-
return `${exports.apiHost}/oauth/authorize?${queryParams}`;
|
|
158
|
-
}
|
|
159
|
-
function getAnchorQuery() {
|
|
160
|
-
return window.location.hash.replace(/^#\/?/, '');
|
|
161
|
-
}
|
|
162
|
-
function getAnchorParams() {
|
|
163
|
-
const query = getAnchorQuery();
|
|
164
|
-
// eslint-disable-next-line @stylistic/padding-line-between-statements,@typescript-eslint/no-unsafe-return
|
|
165
|
-
return Object.fromEntries(query.split('&').map(pair => pair.split('=').map(decodeURIComponent)));
|
|
166
|
-
}
|
|
167
|
-
function getAnchorToken() {
|
|
168
|
-
const params = getAnchorParams();
|
|
169
|
-
return Object.fromEntries(Object.entries(params).filter(([key]) => anchorParams.includes(key)));
|
|
170
|
-
}
|
|
171
|
-
function isAnchorToken(anchorToken) {
|
|
172
|
-
const queryKeys = Object.keys(anchorToken);
|
|
173
|
-
return anchorParams.every(key => queryKeys.includes(key));
|
|
174
|
-
}
|
|
175
|
-
function cleanAnchorParams() {
|
|
176
|
-
const query = window.location.hash.replace(/^#\/?/, '');
|
|
177
|
-
const targets = [...anchorParams, 'error', 'message'];
|
|
178
|
-
const newHash = query
|
|
179
|
-
.split('&')
|
|
180
|
-
.filter(pair => !targets.includes(decodeURIComponent(pair.split('=')[0])))
|
|
181
|
-
.join('&');
|
|
182
|
-
if (newHash) {
|
|
183
|
-
window.location.hash = newHash;
|
|
184
|
-
}
|
|
185
|
-
else {
|
|
186
|
-
const { origin, pathname, search } = window.location;
|
|
187
|
-
window.history.replaceState(null, document.title, `${origin}${pathname}${search}`);
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
function isValidState(state) {
|
|
191
|
-
const key = `${storagePrefix}${statePrefix}${state}`;
|
|
192
|
-
const found = window.localStorage.getItem(key) != null;
|
|
193
|
-
if (found) {
|
|
194
|
-
window.localStorage.removeItem(key);
|
|
195
|
-
}
|
|
196
|
-
return found;
|
|
197
|
-
}
|
|
198
|
-
function anchorContainsError() {
|
|
199
|
-
return 'error' in getAnchorParams();
|
|
200
|
-
}
|
|
201
|
-
function generateState() {
|
|
202
|
-
// @ts-expect-error TS2365
|
|
203
|
-
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
|
|
204
|
-
const state = ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, // @ts-expect-error TS2362
|
|
205
|
-
// @ts-expect-error TS2362
|
|
206
|
-
c => (c ^ ((Math.random() * 256) & (0x0f >>> (c >>> 2)))).toString(16));
|
|
207
|
-
const key = `${storagePrefix}${statePrefix}${state}`;
|
|
208
|
-
window.localStorage.setItem(key, `${Date.now()}`);
|
|
209
|
-
return state;
|
|
210
|
-
}
|
|
211
|
-
class OAuthError extends Error {
|
|
212
|
-
constructor(message, error) {
|
|
213
|
-
super(message);
|
|
214
|
-
this.error = String(error);
|
|
215
|
-
}
|
|
216
|
-
toString() {
|
|
217
|
-
let error = this.error;
|
|
218
|
-
if (error.includes('_')) {
|
|
219
|
-
error = error.replace('_', ' ').replace(/^./, c => c.toUpperCase());
|
|
220
|
-
}
|
|
221
|
-
return this.message ? `${error}: ${this.message}` : error;
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
function getError() {
|
|
225
|
-
const params = getAnchorParams();
|
|
226
|
-
return params.message
|
|
227
|
-
? new OAuthError(params.message, params.error)
|
|
228
|
-
: new OAuthError(titleCase(params.error), params.error);
|
|
229
|
-
}
|
|
230
|
-
/**
|
|
231
|
-
* Our goal is to support even obsolete platforms (ES2017+ / Node.js 8.10+).
|
|
232
|
-
* This is a small polyfill for possibly missing method used in our codebase.
|
|
233
|
-
*/
|
|
234
|
-
if (!Object.fromEntries) { // eslint-disable-next-line arrow-body-style
|
|
235
|
-
Object.fromEntries = (entries) => {
|
|
236
|
-
return Array.from(entries).reduce((object, entry) => {
|
|
237
|
-
if (!Array.isArray(entry)) {
|
|
238
|
-
throw new TypeError(`Iterator value ${entry} is not an entry object.`);
|
|
239
|
-
}
|
|
240
|
-
object[`${entry[0]}`] = entry[1];
|
|
241
|
-
return object;
|
|
242
|
-
}, {});
|
|
243
|
-
};
|
|
37
|
+
//
|
|
244
38
|
}
|
|
245
39
|
//# sourceMappingURL=oauth.js.map
|
package/cjs/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":";;;AAuBA,4CAMC;AAED,oCAIC;AAED,sCAEC;AAED,wBAEC;AA3CD,sDAAsD;AAC3C,QAAA,OAAO,GAAG,EAAE,CAAC;AAEX,QAAA,KAAK,GAMP,IAAI,CAAC;AAEhB,IAAI,WAAW,GAAG,EAAE,CAAC;AACrB,IAAI,WAAW,GAAG,EAAE,CAAC;AACrB,IAAI,WAAW,GAAG,CAAC,GAAG,CAAC,CAAC;AAExB;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAAC,MAAc,EAAE,QAAgB,EAAE,WAAW,GAAG,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC;IACjG,eAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAErC,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,WAAW,GAAG,MAAM,CAAC;AACvB,CAAC;AAEM,KAAK,UAAU,YAAY;IAChC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE;QACtB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,eAAO,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,aAAa;IAC3B,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,KAAK,UAAU,MAAM;IAC1B,EAAE;AACJ,CAAC"}
|
package/cjs/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/cjs/utils.js
CHANGED
|
@@ -143,8 +143,7 @@ async function request(path, body, extraHeaders, extraOptions) {
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
function getRequestInit(body, extraHeaders, extraOptions) {
|
|
146
|
-
var _a;
|
|
147
|
-
const authorization = oauth_js_1.token ? { Authorization: oauth_js_1.token.toString() } : null;
|
|
146
|
+
var _a, _b;
|
|
148
147
|
let contentType = null;
|
|
149
148
|
if (body !== undefined) {
|
|
150
149
|
switch (true) {
|
|
@@ -168,9 +167,11 @@ function getRequestInit(body, extraHeaders, extraOptions) {
|
|
|
168
167
|
body = JSON.stringify(body);
|
|
169
168
|
}
|
|
170
169
|
}
|
|
171
|
-
const
|
|
172
|
-
|
|
173
|
-
|
|
170
|
+
const token = (_a = document.cookie.split(/; */)
|
|
171
|
+
.find(pair => pair.startsWith('XSRF-TOKEN'))) === null || _a === void 0 ? void 0 : _a.split('=')[1];
|
|
172
|
+
const method = (_b = extraOptions === null || extraOptions === void 0 ? void 0 : extraOptions.method) !== null && _b !== void 0 ? _b : (body != null ? 'POST' : 'GET'); // don't touch `!=` please
|
|
173
|
+
const headers = Object.assign(Object.assign(Object.assign({ Accept: 'application/json' }, contentType), extraHeaders), (method === 'POST' && token && { 'X-CSRF-Token': token }));
|
|
174
|
+
return { body, headers, method, credentials: 'include' };
|
|
174
175
|
}
|
|
175
176
|
function getContext(revivers, keys = Object.keys(revivers)) {
|
|
176
177
|
return {
|
package/cjs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAyDA,0CAuBC;AAwCD,0BA4GC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/esm/api/jobRevision.d.ts
CHANGED
|
@@ -61,16 +61,9 @@ export declare const jobRevisionBuildRevivers: Revivers<ApiJobRevisionBuild, Job
|
|
|
61
61
|
export declare function registerJobRevisionBuild(jobId: number, status: string, start: Date, end: Date): Promise<JobRevisionBuild>;
|
|
62
62
|
export declare function cloneJobRevision(jobId: number, newTitle?: string): Promise<JobRevision>;
|
|
63
63
|
export declare function listJobRevisionLayers(jobId: number): Promise<Layer[]>;
|
|
64
|
-
|
|
64
|
+
type OutputUrl = {
|
|
65
65
|
url: string;
|
|
66
66
|
};
|
|
67
|
-
export
|
|
68
|
-
|
|
69
|
-
} & Omit<ApiSuccess, 'data'> | ApiError;
|
|
70
|
-
export declare function getJobRevisionOutputUrl(jobId: number): Promise<JobRevisionOutputUrl>;
|
|
71
|
-
export type JobRevisionOutput = {
|
|
72
|
-
blob: Blob;
|
|
73
|
-
filename?: string | undefined;
|
|
74
|
-
};
|
|
75
|
-
export declare function getJobRevisionOutput(jobId: number): Promise<JobRevisionOutput>;
|
|
67
|
+
export declare function getOutputUrl(jobId: number): Promise<OutputUrl>;
|
|
68
|
+
export {};
|
|
76
69
|
//# sourceMappingURL=jobRevision.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobRevision.d.ts","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,KAAK,EAAiB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"jobRevision.d.ts","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"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"}
|
package/esm/api/jobRevision.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { layerRevivers } from './layer.js';
|
|
2
|
-
import {
|
|
3
|
-
import { APIError, HTTPError, NetworkError, defaultListHeader, deletedNoneParam, lastJobRevision, request, } from '../utils.js';
|
|
2
|
+
import { defaultListHeader, deletedNoneParam, lastJobRevision, request, } from '../utils.js';
|
|
4
3
|
export const jobRevisionRevivers = {
|
|
5
4
|
archived: undefined,
|
|
6
5
|
};
|
|
@@ -62,58 +61,14 @@ export async function listJobRevisionLayers(jobId) {
|
|
|
62
61
|
const options = { revivers: layerRevivers };
|
|
63
62
|
return request(path, null, defaultListHeader, options);
|
|
64
63
|
}
|
|
65
|
-
|
|
66
|
-
await createJobRevisionBuild(jobId);
|
|
67
|
-
const path = `/v1/jobs/${jobId}/revisions/${lastJobRevision}/result/output-url`;
|
|
68
|
-
return request(path);
|
|
69
|
-
}
|
|
70
|
-
export async function getJobRevisionOutput(jobId) {
|
|
71
|
-
await createJobRevisionBuild(jobId);
|
|
72
|
-
const href = `${apiHost}/v1/jobs/${jobId}/revisions/${lastJobRevision}/result/output`;
|
|
73
|
-
const response = await fetch(href).catch((error) => {
|
|
74
|
-
var _a;
|
|
75
|
-
throw new NetworkError((_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error);
|
|
76
|
-
});
|
|
77
|
-
if (response.ok) {
|
|
78
|
-
const blob = await response.blob().catch(() => {
|
|
79
|
-
throw new APIError({ success: false, error: { type: 'TypeError', message: 'Malformed Blob response' } });
|
|
80
|
-
});
|
|
81
|
-
const contentDisposition = response.headers.get('Content-Disposition');
|
|
82
|
-
if (contentDisposition) {
|
|
83
|
-
const filenameRegex = /filename\*\s*=\s*UTF-8''(.+)/i;
|
|
84
|
-
const filenameMatch = contentDisposition.match(filenameRegex);
|
|
85
|
-
if (filenameMatch === null || filenameMatch === void 0 ? void 0 : filenameMatch[1]) {
|
|
86
|
-
return { blob, filename: filenameMatch[1] };
|
|
87
|
-
}
|
|
88
|
-
const fallbackRegex = /filename\s*=\s*"([^"]+)"/i;
|
|
89
|
-
const fallbackMatch = contentDisposition.match(fallbackRegex);
|
|
90
|
-
if (fallbackMatch === null || fallbackMatch === void 0 ? void 0 : fallbackMatch[1]) {
|
|
91
|
-
return { blob, filename: fallbackMatch[1] };
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
return { blob };
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
// eslint-disable-next-line default-case
|
|
98
|
-
switch (response.status) {
|
|
99
|
-
case 401:
|
|
100
|
-
await authenticate();
|
|
101
|
-
break; // NO-OP
|
|
102
|
-
case 403:
|
|
103
|
-
case 404:
|
|
104
|
-
case 406:
|
|
105
|
-
case 429:
|
|
106
|
-
throw new APIError((await response.json().catch(() => ({
|
|
107
|
-
success: false,
|
|
108
|
-
error: { type: 'HttpException', message: response.statusText },
|
|
109
|
-
}))));
|
|
110
|
-
}
|
|
111
|
-
throw new HTTPError(response);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
async function createJobRevisionBuild(jobId) {
|
|
64
|
+
async function postJobRevisionBuild(jobId) {
|
|
115
65
|
const pathname = `/v1/jobs/${jobId}/revisions/${lastJobRevision}/build`;
|
|
116
66
|
const path = `${pathname}?${deletedNoneParam}`;
|
|
117
67
|
return request(path, null, null, { method: 'POST' });
|
|
118
68
|
}
|
|
69
|
+
export async function getOutputUrl(jobId) {
|
|
70
|
+
const path = `/v1/jobs/${jobId}/revisions/${lastJobRevision}/result/output-url`;
|
|
71
|
+
await postJobRevisionBuild(jobId);
|
|
72
|
+
return request(path);
|
|
73
|
+
}
|
|
119
74
|
//# sourceMappingURL=jobRevision.js.map
|