@enervance/insight-cim-model 1.0.50 → 1.0.51
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.
|
@@ -14,7 +14,8 @@ export declare abstract class JenaFusekiUtils {
|
|
|
14
14
|
static getRequestURLs(fusekiURI: string, loadConfig: Array<string>, classDefinitions: Map<string, any>, graphURI?: string): string[];
|
|
15
15
|
static getRequestURL(fusekiURI: string, classDefinition: any, graphURI?: string): string;
|
|
16
16
|
static fetchData(requestRdfURLs: string[]): Promise<IFusekiResponse[]>;
|
|
17
|
-
static
|
|
17
|
+
private static readonly virtuosoAgent;
|
|
18
|
+
static fetchDataVirtuoso(requestRdfURLs: string[], concurrency?: number): Promise<any[]>;
|
|
18
19
|
static fetchDatav2(requestRdfURLs: string[]): Promise<IFusekiResponse[] | any>;
|
|
19
20
|
static getPostRequests(fusekiUrl: string, method: 'post' | 'put', bodies: string[], contentType: string, graphUrl?: string): IFusekiPostRequest[];
|
|
20
21
|
static getPostRequest(fusekiUrl: string, method: string, body: string, contentType: string, graphUrl?: string): IFusekiPostRequest;
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const superagent = tslib_1.__importStar(require("superagent"));
|
|
6
6
|
const sparql_utils_1 = require("./sparql.utils.js");
|
|
7
7
|
const common_utils_1 = require("./common.utils.js");
|
|
8
|
+
const undici_1 = require("undici");
|
|
8
9
|
class JenaFusekiUtils {
|
|
9
10
|
static generateSaveSparqls(modelContainer, instances) {
|
|
10
11
|
const rdfModel = modelContainer.getRdfModel();
|
|
@@ -37,23 +38,44 @@ class JenaFusekiUtils {
|
|
|
37
38
|
return res.json();
|
|
38
39
|
})));
|
|
39
40
|
}
|
|
40
|
-
static
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
41
|
+
static virtuosoAgent = new undici_1.Agent({
|
|
42
|
+
headersTimeout: 30 * 60 * 1000,
|
|
43
|
+
bodyTimeout: 30 * 60 * 1000
|
|
44
|
+
});
|
|
45
|
+
static async fetchDataVirtuoso(requestRdfURLs, concurrency = 2) {
|
|
46
|
+
if (concurrency < 1) {
|
|
47
|
+
throw new Error('Concurrency must be at least 1.');
|
|
48
|
+
}
|
|
49
|
+
const results = new Array(requestRdfURLs.length);
|
|
50
|
+
let nextIndex = 0;
|
|
51
|
+
const worker = async () => {
|
|
52
|
+
while (true) {
|
|
53
|
+
const index = nextIndex++;
|
|
54
|
+
if (index >= requestRdfURLs.length) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const requestUrl = requestRdfURLs[index];
|
|
58
|
+
const url = new URL(requestUrl);
|
|
59
|
+
const res = await (0, undici_1.fetch)(`${url.origin}${url.pathname}`, {
|
|
60
|
+
method: 'POST',
|
|
61
|
+
headers: {
|
|
62
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
63
|
+
'Accept': 'application/sparql-results+json'
|
|
64
|
+
},
|
|
65
|
+
body: url.searchParams,
|
|
66
|
+
dispatcher: this.virtuosoAgent
|
|
67
|
+
});
|
|
68
|
+
if (!res.ok) {
|
|
69
|
+
throw new Error(`Virtuoso request failed: ${res.status} ${res.statusText}\n${await res.text()}`);
|
|
70
|
+
}
|
|
71
|
+
results[index] = await res.json();
|
|
54
72
|
}
|
|
55
|
-
|
|
56
|
-
|
|
73
|
+
};
|
|
74
|
+
const workers = Array.from({
|
|
75
|
+
length: Math.min(concurrency, requestRdfURLs.length)
|
|
76
|
+
}, () => worker());
|
|
77
|
+
await Promise.all(workers);
|
|
78
|
+
return results;
|
|
57
79
|
}
|
|
58
80
|
static async fetchDatav2(requestRdfURLs) {
|
|
59
81
|
const responses = new Array();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuseki.utils.js","sourceRoot":"","sources":["../../src/utils2/fuseki.utils.ts"],"names":[],"mappings":";;;;AAAA,+DAAyC;AAKzC,iDAAyD;AAEzD,iDAA6C;
|
|
1
|
+
{"version":3,"file":"fuseki.utils.js","sourceRoot":"","sources":["../../src/utils2/fuseki.utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enervance/insight-cim-model",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.51",
|
|
4
4
|
"description": "CIM data model",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,12 +57,12 @@
|
|
|
57
57
|
"dependencies": {
|
|
58
58
|
"@enervance/xml-writer": "0.0.1",
|
|
59
59
|
"@fast-csv/parse": "^4.3.6",
|
|
60
|
+
"@turf/clusters-dbscan": "7.2.0",
|
|
60
61
|
"@turf/helpers": "^7.2.0",
|
|
61
62
|
"@turf/line-intersect": "^7.2.0",
|
|
62
63
|
"@turf/line-to-polygon": "^7.2.0",
|
|
63
64
|
"@turf/point-to-line-distance": "^7.2.0",
|
|
64
65
|
"@turf/turf": "7.2.0",
|
|
65
|
-
"@turf/clusters-dbscan": "7.2.0",
|
|
66
66
|
"complex.js": "^2.1.1",
|
|
67
67
|
"fast-csv": "^4.3.6",
|
|
68
68
|
"jszip": "^3.5.0",
|
|
@@ -70,6 +70,7 @@
|
|
|
70
70
|
"proj4": "^2.9.0",
|
|
71
71
|
"saxes": "^5.0.1",
|
|
72
72
|
"superagent": "^6.1.0",
|
|
73
|
+
"undici": "^8.10.2",
|
|
73
74
|
"uuid": "^14.0.0"
|
|
74
75
|
},
|
|
75
76
|
"peerDependencies": {
|