@esri/hub-common 15.31.2 → 15.31.3
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/esm/items/is-services-directory-disabled.js +5 -2
- package/dist/esm/items/is-services-directory-disabled.js.map +1 -1
- package/dist/esm/resources/_internal/_validate-url-helpers.js +12 -0
- package/dist/esm/resources/_internal/_validate-url-helpers.js.map +1 -1
- package/dist/esm/resources/fetch-image-as-blob.js +7 -2
- package/dist/esm/resources/fetch-image-as-blob.js.map +1 -1
- package/dist/node/items/is-services-directory-disabled.js +5 -2
- package/dist/node/items/is-services-directory-disabled.js.map +1 -1
- package/dist/node/resources/_internal/_validate-url-helpers.js +12 -0
- package/dist/node/resources/_internal/_validate-url-helpers.js.map +1 -1
- package/dist/node/resources/fetch-image-as-blob.js +7 -2
- package/dist/node/resources/fetch-image-as-blob.js.map +1 -1
- package/package.json +5 -4
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { parseServiceUrl } from "@esri/arcgis-rest-feature-layer";
|
|
2
2
|
import { getItem } from "@esri/arcgis-rest-portal";
|
|
3
|
+
import { request } from "@esri/arcgis-rest-request";
|
|
3
4
|
/**
|
|
4
5
|
* Checks if a server's services directory is disabled. Consider hoisting this to RESTJS
|
|
5
6
|
* @param idOrItem A feature service ID or item
|
|
@@ -20,8 +21,10 @@ export const isServicesDirectoryDisabled = async (idOrItem, requestOptions) => {
|
|
|
20
21
|
url = `${url}?token=${token}`;
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
// We use rawResponse to get the status code
|
|
25
|
+
// without having to parse the response body
|
|
26
|
+
const raw = await request(url, Object.assign(Object.assign({}, requestOptions), { rawResponse: true, httpMethod: "GET" }));
|
|
27
|
+
disabled = raw.status !== 200;
|
|
25
28
|
}
|
|
26
29
|
else {
|
|
27
30
|
disabled = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-services-directory-disabled.js","sourceRoot":"","sources":["../../../src/items/is-services-directory-disabled.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"is-services-directory-disabled.js","sourceRoot":"","sources":["../../../src/items/is-services-directory-disabled.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAmB,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGrE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,QAAwB,EACxB,cAA+B,EACb,EAAE;IACpB,IAAI,QAAQ,CAAC;IACb,IAAI;QACF,MAAM,IAAI,GACR,OAAO,QAAQ,KAAK,QAAQ;YAC1B,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC;YACzC,CAAC,CAAC,QAAQ,CAAC;QACf,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAI,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,cAAc,CAAC,cAAc,EAAE;gBAC7D,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,cAAc,CAAC,QAAQ,CACxD,IAAI,CAAC,GAAG,EACR,cAAc,CACf,CAAC;gBACF,IAAI,KAAK,EAAE;oBACT,GAAG,GAAG,GAAG,GAAG,UAAU,KAAK,EAAE,CAAC;iBAC/B;aACF;YAED,4CAA4C;YAC5C,4CAA4C;YAC5C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,kCACxB,cAAc,KACjB,WAAW,EAAE,IAAI,EACjB,UAAU,EAAE,KAAK,IACjB,CAAC;YAEH,QAAQ,GAAG,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC;SAC/B;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC;SACjB;KACF;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,IAAI,CAAC;KACjB;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ItemType } from "../../types";
|
|
2
2
|
import { Logger } from "../../utils";
|
|
3
|
+
import { isNoCorsRequestRequired, sendNoCorsRequest, } from "@esri/arcgis-rest-request";
|
|
3
4
|
const FEATURE_SERVICE_URL_REGEX = /(feature)server(\/|\/(\d+))?$/i;
|
|
4
5
|
/**
|
|
5
6
|
* Feature service / Doc Links Should not have data urls. Let"s exclude them from that.
|
|
@@ -120,6 +121,12 @@ export function getFeatureServiceItem(url, body) {
|
|
|
120
121
|
* @return {*} {Promise<{ ok: boolean, headers: Headers }>}
|
|
121
122
|
*/
|
|
122
123
|
export async function pingUrl(url) {
|
|
124
|
+
// ensure that we handle any no-cors requirements
|
|
125
|
+
/* istanbul ignore next */
|
|
126
|
+
if (isNoCorsRequestRequired(url)) {
|
|
127
|
+
await sendNoCorsRequest(url);
|
|
128
|
+
}
|
|
129
|
+
// If may be possible to use request, and set rawResponse to true and method: Head
|
|
123
130
|
const response = await fetch(url, { method: "HEAD" });
|
|
124
131
|
return {
|
|
125
132
|
ok: response.ok,
|
|
@@ -137,6 +144,11 @@ export async function pingFeatureService(url) {
|
|
|
137
144
|
// make sure the response is in json format
|
|
138
145
|
const parsed = new URL(url);
|
|
139
146
|
parsed.searchParams.set("f", "json");
|
|
147
|
+
// ensure that we handle any no-cors requirements
|
|
148
|
+
/* istanbul ignore next */
|
|
149
|
+
if (isNoCorsRequestRequired(url)) {
|
|
150
|
+
await sendNoCorsRequest(url);
|
|
151
|
+
}
|
|
140
152
|
// Since the feature service can return a 200 response with error (e.g. for
|
|
141
153
|
// non-existing layer), we can only request the full metadata by a GET, not HEAD
|
|
142
154
|
// request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_validate-url-helpers.js","sourceRoot":"","sources":["../../../../src/resources/_internal/_validate-url-helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"_validate-url-helpers.js","sourceRoot":"","sources":["../../../../src/resources/_internal/_validate-url-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
+
import { isNoCorsRequestRequired, sendNoCorsRequest, } from "@esri/arcgis-rest-request";
|
|
1
2
|
/**
|
|
2
3
|
* Given a url to an image, return it as a blob
|
|
3
4
|
* @param {String} url Url to fetch the image from. Must have token if it's a non-publi item resource url
|
|
4
5
|
* @param {Object} options additional optinos
|
|
5
6
|
*/
|
|
6
|
-
export function fetchImageAsBlob(url, options = {}) {
|
|
7
|
+
export async function fetchImageAsBlob(url, options = {}) {
|
|
7
8
|
if (!options.credentials) {
|
|
8
9
|
options.credentials = "same-origin";
|
|
9
10
|
}
|
|
11
|
+
/* istanbul ignore next */
|
|
12
|
+
if (isNoCorsRequestRequired(url)) {
|
|
13
|
+
await sendNoCorsRequest(url);
|
|
14
|
+
}
|
|
10
15
|
// We use fetch intentionally as the url may or may not be for an item url, so we don't
|
|
11
16
|
// want this to run thru the main request logic
|
|
12
|
-
return fetch(url, options).then(response => {
|
|
17
|
+
return fetch(url, options).then((response) => {
|
|
13
18
|
return response.blob();
|
|
14
19
|
});
|
|
15
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-image-as-blob.js","sourceRoot":"","sources":["../../../src/resources/fetch-image-as-blob.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,
|
|
1
|
+
{"version":3,"file":"fetch-image-as-blob.js","sourceRoot":"","sources":["../../../src/resources/fetch-image-as-blob.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,2BAA2B,CAAC;AAEnC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,UAAuB,EAAE;IAEzB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;KACrC;IAED,0BAA0B;IAC1B,IAAI,uBAAuB,CAAC,GAAG,CAAC,EAAE;QAChC,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;KAC9B;IACD,uFAAuF;IACvF,+CAA+C;IAC/C,OAAO,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.isServicesDirectoryDisabled = void 0;
|
|
4
4
|
const arcgis_rest_feature_layer_1 = require("@esri/arcgis-rest-feature-layer");
|
|
5
5
|
const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
|
|
6
|
+
const arcgis_rest_request_1 = require("@esri/arcgis-rest-request");
|
|
6
7
|
/**
|
|
7
8
|
* Checks if a server's services directory is disabled. Consider hoisting this to RESTJS
|
|
8
9
|
* @param idOrItem A feature service ID or item
|
|
@@ -23,8 +24,10 @@ exports.isServicesDirectoryDisabled = async (idOrItem, requestOptions) => {
|
|
|
23
24
|
url = `${url}?token=${token}`;
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
// We use rawResponse to get the status code
|
|
28
|
+
// without having to parse the response body
|
|
29
|
+
const raw = await arcgis_rest_request_1.request(url, Object.assign(Object.assign({}, requestOptions), { rawResponse: true, httpMethod: "GET" }));
|
|
30
|
+
disabled = raw.status !== 200;
|
|
28
31
|
}
|
|
29
32
|
else {
|
|
30
33
|
disabled = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-services-directory-disabled.js","sourceRoot":"","sources":["../../../src/items/is-services-directory-disabled.ts"],"names":[],"mappings":";;;AAAA,+EAAkE;AAClE,iEAAmD;
|
|
1
|
+
{"version":3,"file":"is-services-directory-disabled.js","sourceRoot":"","sources":["../../../src/items/is-services-directory-disabled.ts"],"names":[],"mappings":";;;AAAA,+EAAkE;AAClE,iEAAmD;AACnD,mEAAqE;AAGrE;;;;;GAKG;AACU,QAAA,2BAA2B,GAAG,KAAK,EAC9C,QAAwB,EACxB,cAA+B,EACb,EAAE;IACpB,IAAI,QAAQ,CAAC;IACb,IAAI;QACF,MAAM,IAAI,GACR,OAAO,QAAQ,KAAK,QAAQ;YAC1B,CAAC,CAAC,MAAM,4BAAO,CAAC,QAAQ,EAAE,cAAc,CAAC;YACzC,CAAC,CAAC,QAAQ,CAAC;QACf,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAI,GAAG,GAAG,2CAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,cAAc,CAAC,cAAc,EAAE;gBAC7D,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,cAAc,CAAC,QAAQ,CACxD,IAAI,CAAC,GAAG,EACR,cAAc,CACf,CAAC;gBACF,IAAI,KAAK,EAAE;oBACT,GAAG,GAAG,GAAG,GAAG,UAAU,KAAK,EAAE,CAAC;iBAC/B;aACF;YAED,4CAA4C;YAC5C,4CAA4C;YAC5C,MAAM,GAAG,GAAG,MAAM,6BAAO,CAAC,GAAG,kCACxB,cAAc,KACjB,WAAW,EAAE,IAAI,EACjB,UAAU,EAAE,KAAK,IACjB,CAAC;YAEH,QAAQ,GAAG,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC;SAC/B;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC;SACjB;KACF;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,IAAI,CAAC;KACjB;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.detectDataTypeFromExtension = exports.detectDataTypeFromHeader = exports.pingFeatureService = exports.pingUrl = exports.getFeatureServiceItem = exports.getFeatureLayerItem = exports.getFeatureServiceTitle = exports.isFeatureLayer = exports.isFeatureService = exports.isUrl = exports.getFileName = exports.shouldHaveDataUrl = void 0;
|
|
4
4
|
const types_1 = require("../../types");
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
|
+
const arcgis_rest_request_1 = require("@esri/arcgis-rest-request");
|
|
6
7
|
const FEATURE_SERVICE_URL_REGEX = /(feature)server(\/|\/(\d+))?$/i;
|
|
7
8
|
/**
|
|
8
9
|
* Feature service / Doc Links Should not have data urls. Let"s exclude them from that.
|
|
@@ -131,6 +132,12 @@ exports.getFeatureServiceItem = getFeatureServiceItem;
|
|
|
131
132
|
* @return {*} {Promise<{ ok: boolean, headers: Headers }>}
|
|
132
133
|
*/
|
|
133
134
|
async function pingUrl(url) {
|
|
135
|
+
// ensure that we handle any no-cors requirements
|
|
136
|
+
/* istanbul ignore next */
|
|
137
|
+
if (arcgis_rest_request_1.isNoCorsRequestRequired(url)) {
|
|
138
|
+
await arcgis_rest_request_1.sendNoCorsRequest(url);
|
|
139
|
+
}
|
|
140
|
+
// If may be possible to use request, and set rawResponse to true and method: Head
|
|
134
141
|
const response = await fetch(url, { method: "HEAD" });
|
|
135
142
|
return {
|
|
136
143
|
ok: response.ok,
|
|
@@ -149,6 +156,11 @@ async function pingFeatureService(url) {
|
|
|
149
156
|
// make sure the response is in json format
|
|
150
157
|
const parsed = new URL(url);
|
|
151
158
|
parsed.searchParams.set("f", "json");
|
|
159
|
+
// ensure that we handle any no-cors requirements
|
|
160
|
+
/* istanbul ignore next */
|
|
161
|
+
if (arcgis_rest_request_1.isNoCorsRequestRequired(url)) {
|
|
162
|
+
await arcgis_rest_request_1.sendNoCorsRequest(url);
|
|
163
|
+
}
|
|
152
164
|
// Since the feature service can return a 200 response with error (e.g. for
|
|
153
165
|
// non-existing layer), we can only request the full metadata by a GET, not HEAD
|
|
154
166
|
// request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_validate-url-helpers.js","sourceRoot":"","sources":["../../../../src/resources/_internal/_validate-url-helpers.ts"],"names":[],"mappings":";;;AAKA,uCAAuC;AACvC,uCAAqC;
|
|
1
|
+
{"version":3,"file":"_validate-url-helpers.js","sourceRoot":"","sources":["../../../../src/resources/_internal/_validate-url-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchImageAsBlob = void 0;
|
|
4
|
+
const arcgis_rest_request_1 = require("@esri/arcgis-rest-request");
|
|
4
5
|
/**
|
|
5
6
|
* Given a url to an image, return it as a blob
|
|
6
7
|
* @param {String} url Url to fetch the image from. Must have token if it's a non-publi item resource url
|
|
7
8
|
* @param {Object} options additional optinos
|
|
8
9
|
*/
|
|
9
|
-
function fetchImageAsBlob(url, options = {}) {
|
|
10
|
+
async function fetchImageAsBlob(url, options = {}) {
|
|
10
11
|
if (!options.credentials) {
|
|
11
12
|
options.credentials = "same-origin";
|
|
12
13
|
}
|
|
14
|
+
/* istanbul ignore next */
|
|
15
|
+
if (arcgis_rest_request_1.isNoCorsRequestRequired(url)) {
|
|
16
|
+
await arcgis_rest_request_1.sendNoCorsRequest(url);
|
|
17
|
+
}
|
|
13
18
|
// We use fetch intentionally as the url may or may not be for an item url, so we don't
|
|
14
19
|
// want this to run thru the main request logic
|
|
15
|
-
return fetch(url, options).then(response => {
|
|
20
|
+
return fetch(url, options).then((response) => {
|
|
16
21
|
return response.blob();
|
|
17
22
|
});
|
|
18
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-image-as-blob.js","sourceRoot":"","sources":["../../../src/resources/fetch-image-as-blob.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"fetch-image-as-blob.js","sourceRoot":"","sources":["../../../src/resources/fetch-image-as-blob.ts"],"names":[],"mappings":";;;AAAA,mEAGmC;AAEnC;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,UAAuB,EAAE;IAEzB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;KACrC;IAED,0BAA0B;IAC1B,IAAI,6CAAuB,CAAC,GAAG,CAAC,EAAE;QAChC,MAAM,uCAAiB,CAAC,GAAG,CAAC,CAAC;KAC9B;IACD,uFAAuF;IACvF,+CAA+C;IAC/C,OAAO,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,4CAiBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@esri/hub-common",
|
|
3
|
-
"version": "15.31.
|
|
3
|
+
"version": "15.31.3",
|
|
4
4
|
"description": "Common TypeScript types and utility functions for @esri/hub.js.",
|
|
5
5
|
"main": "dist/node/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
},
|
|
24
24
|
"peerDependencies": {
|
|
25
25
|
"@esri/arcgis-rest-auth": "^2.14.0 || 3",
|
|
26
|
-
"@esri/arcgis-rest-feature-layer": "^3.
|
|
26
|
+
"@esri/arcgis-rest-feature-layer": "^3.8.0",
|
|
27
27
|
"@esri/arcgis-rest-portal": "^2.18.0 || 3",
|
|
28
28
|
"@esri/arcgis-rest-request": "^2.14.0 || 3",
|
|
29
|
-
"@esri/arcgis-rest-service-admin": "^3.
|
|
29
|
+
"@esri/arcgis-rest-service-admin": "^3.8.0",
|
|
30
30
|
"@esri/arcgis-rest-types": "^2.15.0 || 3"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
@@ -47,7 +47,8 @@
|
|
|
47
47
|
"y:push": "yalc push"
|
|
48
48
|
},
|
|
49
49
|
"publishConfig": {
|
|
50
|
-
"access": "public"
|
|
50
|
+
"access": "public",
|
|
51
|
+
"tag": "portal115"
|
|
51
52
|
},
|
|
52
53
|
"repository": "github:/Esri/hub.js",
|
|
53
54
|
"contributors": [
|