@emuanalytics/flow-engine-client 1.3.119 → 1.3.123
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/bundle.js +2 -2
- package/dist/bundle.js.map +3 -3
- package/dist/cjs/lib/dataset.endpoints.js +7 -1
- package/dist/cjs/lib/dataset.endpoints.js.map +1 -1
- package/dist/cjs/lib/upload.endpoints.js +6 -4
- package/dist/cjs/lib/upload.endpoints.js.map +1 -1
- package/dist/esm/lib/dataset.endpoints.js +7 -1
- package/dist/esm/lib/dataset.endpoints.js.map +1 -1
- package/dist/esm/lib/upload.endpoints.js +6 -4
- package/dist/esm/lib/upload.endpoints.js.map +1 -1
- package/dist/types/lib/dataset.endpoints.d.ts +1 -0
- package/dist/types/lib/dataset.endpoints.d.ts.map +1 -1
- package/dist/types/lib/upload.endpoints.d.ts +1 -0
- package/dist/types/lib/upload.endpoints.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -50,9 +50,15 @@ var DatasetEndpoints = /** @class */ (function (_super) {
|
|
|
50
50
|
if (typeof params === 'string') {
|
|
51
51
|
params = { format: params };
|
|
52
52
|
}
|
|
53
|
+
var abortController = null;
|
|
54
|
+
if (params.abortController) {
|
|
55
|
+
abortController = params.abortController;
|
|
56
|
+
delete params.abortController;
|
|
57
|
+
}
|
|
53
58
|
return this.client
|
|
54
59
|
._post("/api/v1/datasets/".concat(datasetId, "/query"), query, {
|
|
55
|
-
params: __assign(__assign({}, params), { format: params.format || 'json', explain: params.explain || false })
|
|
60
|
+
params: __assign(__assign({}, params), { format: params.format || 'json', explain: params.explain || false }),
|
|
61
|
+
signal: abortController === null || abortController === void 0 ? void 0 : abortController.signal
|
|
56
62
|
})
|
|
57
63
|
.catch(function (e) {
|
|
58
64
|
if (e.message === 'Network Error') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.endpoints.js","sourceRoot":"","sources":["../../../src/lib/dataset.endpoints.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,mDAAiD;
|
|
1
|
+
{"version":3,"file":"dataset.endpoints.js","sourceRoot":"","sources":["../../../src/lib/dataset.endpoints.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,mDAAiD;AAiBjD;IAAsC,oCAAuB;IAC3D,0BAAY,MAAc;eACxB,kBAAM,MAAM,EAAE,UAAU,CAAC;IAC3B,CAAC;IAED,gCAAK,GAAL,UACE,SAAgC,EAChC,KAAwB,EACxB,MAAoD;QADpD,sBAAA,EAAA,UAAwB;QACxB,uBAAA,EAAA,WAAoD;QAEpD,2CAA2C;QAC3C,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,MAAM,yBAAQ,SAAS,CAAC,MAAM,KAAE,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,MAAM,GAAE,CAAC;YACrE,KAAK,GAAG,SAAS,CAAC;YAClB,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;YAC5B,OAAO,KAAK,CAAC,SAAS,CAAC;YACvB,OAAO,KAAK,CAAC,MAAM,CAAC;SACrB;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,MAAM,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;SAC7B;QAED,IAAI,eAAe,GAA2B,IAAI,CAAC;QACnD,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;YACzC,OAAO,MAAM,CAAC,eAAe,CAAC;SAC/B;QAED,OAAO,IAAI,CAAC,MAAM;aACf,KAAK,CAAC,2BAAoB,SAAS,WAAQ,EAAE,KAAK,EAAE;YACnD,MAAM,wBACD,MAAM,KACT,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,MAAM,EAC/B,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,GACjC;YACD,MAAM,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM;SAChC,CAAC;aACD,KAAK,CAAC,UAAA,CAAC;YACN,IAAI,CAAC,CAAC,OAAO,KAAK,eAAe,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;aACpC;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iCAAM,GAAN,UAAO,aAA6B,EAAE,MAAgC;QAAhC,uBAAA,EAAA,WAAgC;QACpE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAAoB,aAAa,CAAC,SAAS,YAAS,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACxG,CAAC;IAED,uCAAY,GAAZ,UAAa,SAAiB,EAAE,MAAwB;QACtD,IAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW;YACzC,CAAC,CAAC,sBAAe,IAAI,CAAC,MAAM,CAAC,WAAW,CAAE;YAC1C,CAAC,CAAC,iBAAU,IAAI,CAAC,MAAM,CAAC,MAAM,CAAE,CAAC;QACnC,OAAO,UAAG,IAAI,CAAC,MAAM,CAAC,OAAO,8BAAoB,SAAS,4BAAkB,MAAM,cAAI,WAAW,CAAE,CAAC;IACtG,CAAC;IAED,oCAAS,GAAT,UAAU,SAAiB,EAAE,EAA8B;QACzD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAW,SAAS,CAAE,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IACH,uBAAC;AAAD,CAAC,AA7DD,CAAsC,8BAAa,GA6DlD;AA7DY,4CAAgB","sourcesContent":["/**\n * Copyright © 2018 Emu Analytics\n */\n\nimport { FileExportFormat, IDataset, IIngestMessage } from './api-interfaces';\nimport { BaseEndpoints } from './base.endpoints';\nimport { Client } from './client';\nimport { WebSocketSubscribeCallback, WebSocketUnsubscriber } from './web-socket-gateway';\n\nexport interface DatasetQuery {\n [key: string]: any;\n}\n\ntype QueryOutputFormat = 'plain' | 'json' | 'csv' | 'geojson';\n\nexport interface DatasetQueryOptions {\n [param: string]: any;\n format?: QueryOutputFormat;\n explain?: boolean | string;\n abortController?: AbortController;\n}\n\nexport class DatasetEndpoints extends BaseEndpoints<IDataset> {\n constructor(client: Client) {\n super(client, 'datasets');\n }\n\n query(\n datasetId: string | DatasetQuery,\n query: DatasetQuery = {},\n params: DatasetQueryOptions | QueryOutputFormat = {}\n ): Promise<any> {\n // Support Flo.w RDF-style query definition\n if (typeof datasetId === 'object') {\n params = { ...datasetId.params, format: datasetId.format || 'json' };\n query = datasetId;\n datasetId = query.datasetId;\n delete query.datasetId;\n delete query.format;\n }\n\n if (typeof params === 'string') {\n params = { format: params };\n }\n\n let abortController: AbortController | null = null;\n if (params.abortController) {\n abortController = params.abortController;\n delete params.abortController;\n }\n\n return this.client\n ._post(`/api/v1/datasets/${datasetId}/query`, query, {\n params: {\n ...params,\n format: params.format || 'json',\n explain: params.explain || false\n },\n signal: abortController?.signal\n })\n .catch(e => {\n if (e.message === 'Network Error') {\n throw new Error('Query timed out');\n } else {\n throw e;\n }\n });\n }\n\n ingest(ingestMessage: IIngestMessage, params: Record<string, any> = {}): Promise<any> {\n return this.client._post(`/api/v1/datasets/${ingestMessage.datasetId}/ingest`, ingestMessage, params);\n }\n\n getExportUrl(datasetId: string, format: FileExportFormat): string {\n const credentials = this.client.accessToken\n ? `accesstoken=${this.client.accessToken}`\n : `apikey=${this.client.apiKey}`;\n return `${this.client.baseUrl}/api/v1/datasets/${datasetId}/export?format=${format}&${credentials}`;\n }\n\n subscribe(datasetId: string, cb: WebSocketSubscribeCallback): WebSocketUnsubscriber {\n return this.client._subscribe(`dataset/${datasetId}`, cb);\n }\n}\n"]}
|
|
@@ -66,12 +66,12 @@ var UploadEndpoints = /** @class */ (function (_super) {
|
|
|
66
66
|
return _super.call(this, client, 'uploads') || this;
|
|
67
67
|
}
|
|
68
68
|
UploadEndpoints.prototype.upload = function (options, params) {
|
|
69
|
-
var _a, _b;
|
|
69
|
+
var _a, _b, _c;
|
|
70
70
|
if (params === void 0) { params = {}; }
|
|
71
71
|
return __awaiter(this, void 0, void 0, function () {
|
|
72
72
|
var form, upload;
|
|
73
|
-
return __generator(this, function (
|
|
74
|
-
switch (
|
|
73
|
+
return __generator(this, function (_d) {
|
|
74
|
+
switch (_d.label) {
|
|
75
75
|
case 0:
|
|
76
76
|
form = new form_data_1.default();
|
|
77
77
|
if (options.datasetName) {
|
|
@@ -102,12 +102,14 @@ var UploadEndpoints = /** @class */ (function (_super) {
|
|
|
102
102
|
return [4 /*yield*/, this.client._post(this.resourceEndpoint, form, {
|
|
103
103
|
// Note - only Node FormData supports getHeaders
|
|
104
104
|
headers: (_b = (_a = form.getHeaders) === null || _a === void 0 ? void 0 : _a.call(form)) !== null && _b !== void 0 ? _b : { 'Content-Type': 'multipart/form-data' },
|
|
105
|
+
// Add abort signal
|
|
106
|
+
signal: (_c = options.abortController) === null || _c === void 0 ? void 0 : _c.signal,
|
|
105
107
|
params: params,
|
|
106
108
|
// Note that progress only works in the browser!!
|
|
107
109
|
onUploadProgress: options.progress
|
|
108
110
|
})];
|
|
109
111
|
case 1:
|
|
110
|
-
upload =
|
|
112
|
+
upload = _d.sent();
|
|
111
113
|
return [2 /*return*/, upload];
|
|
112
114
|
}
|
|
113
115
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.endpoints.js","sourceRoot":"","sources":["../../../src/lib/upload.endpoints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,wDAAiC;AAEjC,mDAAiD;
|
|
1
|
+
{"version":3,"file":"upload.endpoints.js","sourceRoot":"","sources":["../../../src/lib/upload.endpoints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,wDAAiC;AAEjC,mDAAiD;AAoBjD;IAAqC,mCAAsB;IACzD,yBAAY,MAAc;eACxB,kBAAM,MAAM,EAAE,SAAS,CAAC;IAC1B,CAAC;IAEK,gCAAM,GAAZ,UAAa,OAAsB,EAAE,MAAgC;;QAAhC,uBAAA,EAAA,WAAgC;;;;;;wBAC7D,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAC;wBAC5B,IAAI,OAAO,CAAC,WAAW,EAAE;4BACvB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;yBAC1C;wBACD,IAAI,OAAO,CAAC,kBAAkB,EAAE;4BAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;yBACxD;wBACD,IAAI,OAAO,CAAC,WAAW,EAAE;4BACvB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;yBACjD;wBACD,IAAI,OAAO,CAAC,SAAS,EAAE;4BACrB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;yBAC7C;wBACD,IAAI,OAAO,CAAC,UAAU,EAAE;4BACtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;yBAC/C;wBACD,IAAI,OAAO,CAAC,UAAU,EAAE;4BACtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;yBAC/C;wBACD,IAAI,OAAO,CAAC,MAAM,EAAE;4BAClB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;yBACvC;wBACD,IAAI,OAAO,CAAC,QAAQ,EAAE;4BACpB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;yBAC3D;wBACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;wBAE5B,qBAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE;gCAC3E,gDAAgD;gCAChD,OAAO,EAAE,MAAA,MAAA,IAAI,CAAC,UAAU,oDAAI,mCAAI,EAAE,cAAc,EAAE,qBAAqB,EAAE;gCACzE,mBAAmB;gCACnB,MAAM,EAAE,MAAA,OAAO,CAAC,eAAe,0CAAE,MAAM;gCACvC,MAAM,QAAA;gCACN,iDAAiD;gCACjD,gBAAgB,EAAE,OAAO,CAAC,QAAQ;6BACnC,CAAC,EAAA;;wBARI,MAAM,GAAY,SAQtB;wBAEF,sBAAO,MAAM,EAAC;;;;KACf;IACH,sBAAC;AAAD,CAAC,AA7CD,CAAqC,8BAAa,GA6CjD;AA7CY,0CAAe","sourcesContent":["/**\n * Copyright © 2018 Emu Analytics\n */\nimport FormData from 'form-data';\nimport { IUpload } from './api-interfaces';\nimport { BaseEndpoints } from './base.endpoints';\nimport { Client } from './client';\n\ndeclare var process: any;\n\nexport interface UploadOptions {\n data: any;\n filename: string;\n datasetId?: string;\n datasetName?: string;\n datasetDescription?: string;\n attribution?: string;\n sourceSrid?: number;\n targetSrid?: number;\n schema?: string;\n metadata?: any;\n abortController?: AbortController;\n progress?: (event: any) => void;\n}\n\nexport class UploadEndpoints extends BaseEndpoints<IUpload> {\n constructor(client: Client) {\n super(client, 'uploads');\n }\n\n async upload(options: UploadOptions, params: Record<string, any> = {}): Promise<IUpload> {\n const form = new FormData();\n if (options.datasetName) {\n form.append('name', options.datasetName);\n }\n if (options.datasetDescription) {\n form.append('description', options.datasetDescription);\n }\n if (options.attribution) {\n form.append('attribution', options.attribution);\n }\n if (options.datasetId) {\n form.append('datasetId', options.datasetId);\n }\n if (options.sourceSrid) {\n form.append('sourceSrid', options.sourceSrid);\n }\n if (options.targetSrid) {\n form.append('targetSrid', options.targetSrid);\n }\n if (options.schema) {\n form.append('schema', options.schema);\n }\n if (options.metadata) {\n form.append('metadata', JSON.stringify(options.metadata));\n }\n form.append('file', options.data, options.filename);\n\n const upload: IUpload = await this.client._post(this.resourceEndpoint, form, {\n // Note - only Node FormData supports getHeaders\n headers: form.getHeaders?.() ?? { 'Content-Type': 'multipart/form-data' },\n // Add abort signal\n signal: options.abortController?.signal,\n params,\n // Note that progress only works in the browser!!\n onUploadProgress: options.progress\n });\n\n return upload;\n }\n}\n"]}
|
|
@@ -47,9 +47,15 @@ var DatasetEndpoints = /** @class */ (function (_super) {
|
|
|
47
47
|
if (typeof params === 'string') {
|
|
48
48
|
params = { format: params };
|
|
49
49
|
}
|
|
50
|
+
var abortController = null;
|
|
51
|
+
if (params.abortController) {
|
|
52
|
+
abortController = params.abortController;
|
|
53
|
+
delete params.abortController;
|
|
54
|
+
}
|
|
50
55
|
return this.client
|
|
51
56
|
._post("/api/v1/datasets/".concat(datasetId, "/query"), query, {
|
|
52
|
-
params: __assign(__assign({}, params), { format: params.format || 'json', explain: params.explain || false })
|
|
57
|
+
params: __assign(__assign({}, params), { format: params.format || 'json', explain: params.explain || false }),
|
|
58
|
+
signal: abortController === null || abortController === void 0 ? void 0 : abortController.signal
|
|
53
59
|
})
|
|
54
60
|
.catch(function (e) {
|
|
55
61
|
if (e.message === 'Network Error') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.endpoints.js","sourceRoot":"","sources":["../../../src/lib/dataset.endpoints.ts"],"names":[],"mappings":"AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"dataset.endpoints.js","sourceRoot":"","sources":["../../../src/lib/dataset.endpoints.ts"],"names":[],"mappings":"AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAiBjD;IAAsC,oCAAuB;IAC3D,0BAAY,MAAc;eACxB,kBAAM,MAAM,EAAE,UAAU,CAAC;IAC3B,CAAC;IAED,gCAAK,GAAL,UACE,SAAgC,EAChC,KAAwB,EACxB,MAAoD;QADpD,sBAAA,EAAA,UAAwB;QACxB,uBAAA,EAAA,WAAoD;QAEpD,2CAA2C;QAC3C,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,MAAM,yBAAQ,SAAS,CAAC,MAAM,KAAE,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,MAAM,GAAE,CAAC;YACrE,KAAK,GAAG,SAAS,CAAC;YAClB,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;YAC5B,OAAO,KAAK,CAAC,SAAS,CAAC;YACvB,OAAO,KAAK,CAAC,MAAM,CAAC;SACrB;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,MAAM,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;SAC7B;QAED,IAAI,eAAe,GAA2B,IAAI,CAAC;QACnD,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;YACzC,OAAO,MAAM,CAAC,eAAe,CAAC;SAC/B;QAED,OAAO,IAAI,CAAC,MAAM;aACf,KAAK,CAAC,2BAAoB,SAAS,WAAQ,EAAE,KAAK,EAAE;YACnD,MAAM,wBACD,MAAM,KACT,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,MAAM,EAC/B,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK,GACjC;YACD,MAAM,EAAE,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM;SAChC,CAAC;aACD,KAAK,CAAC,UAAA,CAAC;YACN,IAAI,CAAC,CAAC,OAAO,KAAK,eAAe,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;aACpC;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iCAAM,GAAN,UAAO,aAA6B,EAAE,MAAgC;QAAhC,uBAAA,EAAA,WAAgC;QACpE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAAoB,aAAa,CAAC,SAAS,YAAS,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACxG,CAAC;IAED,uCAAY,GAAZ,UAAa,SAAiB,EAAE,MAAwB;QACtD,IAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW;YACzC,CAAC,CAAC,sBAAe,IAAI,CAAC,MAAM,CAAC,WAAW,CAAE;YAC1C,CAAC,CAAC,iBAAU,IAAI,CAAC,MAAM,CAAC,MAAM,CAAE,CAAC;QACnC,OAAO,UAAG,IAAI,CAAC,MAAM,CAAC,OAAO,8BAAoB,SAAS,4BAAkB,MAAM,cAAI,WAAW,CAAE,CAAC;IACtG,CAAC;IAED,oCAAS,GAAT,UAAU,SAAiB,EAAE,EAA8B;QACzD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAW,SAAS,CAAE,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IACH,uBAAC;AAAD,CAAC,AA7DD,CAAsC,aAAa,GA6DlD","sourcesContent":["/**\n * Copyright © 2018 Emu Analytics\n */\n\nimport { FileExportFormat, IDataset, IIngestMessage } from './api-interfaces';\nimport { BaseEndpoints } from './base.endpoints';\nimport { Client } from './client';\nimport { WebSocketSubscribeCallback, WebSocketUnsubscriber } from './web-socket-gateway';\n\nexport interface DatasetQuery {\n [key: string]: any;\n}\n\ntype QueryOutputFormat = 'plain' | 'json' | 'csv' | 'geojson';\n\nexport interface DatasetQueryOptions {\n [param: string]: any;\n format?: QueryOutputFormat;\n explain?: boolean | string;\n abortController?: AbortController;\n}\n\nexport class DatasetEndpoints extends BaseEndpoints<IDataset> {\n constructor(client: Client) {\n super(client, 'datasets');\n }\n\n query(\n datasetId: string | DatasetQuery,\n query: DatasetQuery = {},\n params: DatasetQueryOptions | QueryOutputFormat = {}\n ): Promise<any> {\n // Support Flo.w RDF-style query definition\n if (typeof datasetId === 'object') {\n params = { ...datasetId.params, format: datasetId.format || 'json' };\n query = datasetId;\n datasetId = query.datasetId;\n delete query.datasetId;\n delete query.format;\n }\n\n if (typeof params === 'string') {\n params = { format: params };\n }\n\n let abortController: AbortController | null = null;\n if (params.abortController) {\n abortController = params.abortController;\n delete params.abortController;\n }\n\n return this.client\n ._post(`/api/v1/datasets/${datasetId}/query`, query, {\n params: {\n ...params,\n format: params.format || 'json',\n explain: params.explain || false\n },\n signal: abortController?.signal\n })\n .catch(e => {\n if (e.message === 'Network Error') {\n throw new Error('Query timed out');\n } else {\n throw e;\n }\n });\n }\n\n ingest(ingestMessage: IIngestMessage, params: Record<string, any> = {}): Promise<any> {\n return this.client._post(`/api/v1/datasets/${ingestMessage.datasetId}/ingest`, ingestMessage, params);\n }\n\n getExportUrl(datasetId: string, format: FileExportFormat): string {\n const credentials = this.client.accessToken\n ? `accesstoken=${this.client.accessToken}`\n : `apikey=${this.client.apiKey}`;\n return `${this.client.baseUrl}/api/v1/datasets/${datasetId}/export?format=${format}&${credentials}`;\n }\n\n subscribe(datasetId: string, cb: WebSocketSubscribeCallback): WebSocketUnsubscriber {\n return this.client._subscribe(`dataset/${datasetId}`, cb);\n }\n}\n"]}
|
|
@@ -60,12 +60,12 @@ var UploadEndpoints = /** @class */ (function (_super) {
|
|
|
60
60
|
return _super.call(this, client, 'uploads') || this;
|
|
61
61
|
}
|
|
62
62
|
UploadEndpoints.prototype.upload = function (options, params) {
|
|
63
|
-
var _a, _b;
|
|
63
|
+
var _a, _b, _c;
|
|
64
64
|
if (params === void 0) { params = {}; }
|
|
65
65
|
return __awaiter(this, void 0, void 0, function () {
|
|
66
66
|
var form, upload;
|
|
67
|
-
return __generator(this, function (
|
|
68
|
-
switch (
|
|
67
|
+
return __generator(this, function (_d) {
|
|
68
|
+
switch (_d.label) {
|
|
69
69
|
case 0:
|
|
70
70
|
form = new FormData();
|
|
71
71
|
if (options.datasetName) {
|
|
@@ -96,12 +96,14 @@ var UploadEndpoints = /** @class */ (function (_super) {
|
|
|
96
96
|
return [4 /*yield*/, this.client._post(this.resourceEndpoint, form, {
|
|
97
97
|
// Note - only Node FormData supports getHeaders
|
|
98
98
|
headers: (_b = (_a = form.getHeaders) === null || _a === void 0 ? void 0 : _a.call(form)) !== null && _b !== void 0 ? _b : { 'Content-Type': 'multipart/form-data' },
|
|
99
|
+
// Add abort signal
|
|
100
|
+
signal: (_c = options.abortController) === null || _c === void 0 ? void 0 : _c.signal,
|
|
99
101
|
params: params,
|
|
100
102
|
// Note that progress only works in the browser!!
|
|
101
103
|
onUploadProgress: options.progress
|
|
102
104
|
})];
|
|
103
105
|
case 1:
|
|
104
|
-
upload =
|
|
106
|
+
upload = _d.sent();
|
|
105
107
|
return [2 /*return*/, upload];
|
|
106
108
|
}
|
|
107
109
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.endpoints.js","sourceRoot":"","sources":["../../../src/lib/upload.endpoints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"upload.endpoints.js","sourceRoot":"","sources":["../../../src/lib/upload.endpoints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAoBjD;IAAqC,mCAAsB;IACzD,yBAAY,MAAc;eACxB,kBAAM,MAAM,EAAE,SAAS,CAAC;IAC1B,CAAC;IAEK,gCAAM,GAAZ,UAAa,OAAsB,EAAE,MAAgC;;QAAhC,uBAAA,EAAA,WAAgC;;;;;;wBAC7D,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;wBAC5B,IAAI,OAAO,CAAC,WAAW,EAAE;4BACvB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;yBAC1C;wBACD,IAAI,OAAO,CAAC,kBAAkB,EAAE;4BAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;yBACxD;wBACD,IAAI,OAAO,CAAC,WAAW,EAAE;4BACvB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;yBACjD;wBACD,IAAI,OAAO,CAAC,SAAS,EAAE;4BACrB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;yBAC7C;wBACD,IAAI,OAAO,CAAC,UAAU,EAAE;4BACtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;yBAC/C;wBACD,IAAI,OAAO,CAAC,UAAU,EAAE;4BACtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;yBAC/C;wBACD,IAAI,OAAO,CAAC,MAAM,EAAE;4BAClB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;yBACvC;wBACD,IAAI,OAAO,CAAC,QAAQ,EAAE;4BACpB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;yBAC3D;wBACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;wBAE5B,qBAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE;gCAC3E,gDAAgD;gCAChD,OAAO,EAAE,MAAA,MAAA,IAAI,CAAC,UAAU,oDAAI,mCAAI,EAAE,cAAc,EAAE,qBAAqB,EAAE;gCACzE,mBAAmB;gCACnB,MAAM,EAAE,MAAA,OAAO,CAAC,eAAe,0CAAE,MAAM;gCACvC,MAAM,QAAA;gCACN,iDAAiD;gCACjD,gBAAgB,EAAE,OAAO,CAAC,QAAQ;6BACnC,CAAC,EAAA;;wBARI,MAAM,GAAY,SAQtB;wBAEF,sBAAO,MAAM,EAAC;;;;KACf;IACH,sBAAC;AAAD,CAAC,AA7CD,CAAqC,aAAa,GA6CjD","sourcesContent":["/**\n * Copyright © 2018 Emu Analytics\n */\nimport FormData from 'form-data';\nimport { IUpload } from './api-interfaces';\nimport { BaseEndpoints } from './base.endpoints';\nimport { Client } from './client';\n\ndeclare var process: any;\n\nexport interface UploadOptions {\n data: any;\n filename: string;\n datasetId?: string;\n datasetName?: string;\n datasetDescription?: string;\n attribution?: string;\n sourceSrid?: number;\n targetSrid?: number;\n schema?: string;\n metadata?: any;\n abortController?: AbortController;\n progress?: (event: any) => void;\n}\n\nexport class UploadEndpoints extends BaseEndpoints<IUpload> {\n constructor(client: Client) {\n super(client, 'uploads');\n }\n\n async upload(options: UploadOptions, params: Record<string, any> = {}): Promise<IUpload> {\n const form = new FormData();\n if (options.datasetName) {\n form.append('name', options.datasetName);\n }\n if (options.datasetDescription) {\n form.append('description', options.datasetDescription);\n }\n if (options.attribution) {\n form.append('attribution', options.attribution);\n }\n if (options.datasetId) {\n form.append('datasetId', options.datasetId);\n }\n if (options.sourceSrid) {\n form.append('sourceSrid', options.sourceSrid);\n }\n if (options.targetSrid) {\n form.append('targetSrid', options.targetSrid);\n }\n if (options.schema) {\n form.append('schema', options.schema);\n }\n if (options.metadata) {\n form.append('metadata', JSON.stringify(options.metadata));\n }\n form.append('file', options.data, options.filename);\n\n const upload: IUpload = await this.client._post(this.resourceEndpoint, form, {\n // Note - only Node FormData supports getHeaders\n headers: form.getHeaders?.() ?? { 'Content-Type': 'multipart/form-data' },\n // Add abort signal\n signal: options.abortController?.signal,\n params,\n // Note that progress only works in the browser!!\n onUploadProgress: options.progress\n });\n\n return upload;\n }\n}\n"]}
|
|
@@ -13,6 +13,7 @@ export interface DatasetQueryOptions {
|
|
|
13
13
|
[param: string]: any;
|
|
14
14
|
format?: QueryOutputFormat;
|
|
15
15
|
explain?: boolean | string;
|
|
16
|
+
abortController?: AbortController;
|
|
16
17
|
}
|
|
17
18
|
export declare class DatasetEndpoints extends BaseEndpoints<IDataset> {
|
|
18
19
|
constructor(client: Client);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.endpoints.d.ts","sourceRoot":"","sources":["../../../src/lib/dataset.endpoints.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEzF,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,KAAK,iBAAiB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;IACrB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dataset.endpoints.d.ts","sourceRoot":"","sources":["../../../src/lib/dataset.endpoints.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEzF,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,KAAK,iBAAiB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;IACrB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,QAAQ,CAAC;gBAC/C,MAAM,EAAE,MAAM;IAI1B,KAAK,CACH,SAAS,EAAE,MAAM,GAAG,YAAY,EAChC,KAAK,GAAE,YAAiB,EACxB,MAAM,GAAE,mBAAmB,GAAG,iBAAsB,GACnD,OAAO,CAAC,GAAG,CAAC;IAsCf,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIrF,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,MAAM;IAOjE,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,0BAA0B,GAAG,qBAAqB;CAGpF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.endpoints.d.ts","sourceRoot":"","sources":["../../../src/lib/upload.endpoints.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CACjC;AAED,qBAAa,eAAgB,SAAQ,aAAa,CAAC,OAAO,CAAC;gBAC7C,MAAM,EAAE,MAAM;IAIpB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"upload.endpoints.d.ts","sourceRoot":"","sources":["../../../src/lib/upload.endpoints.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CACjC;AAED,qBAAa,eAAgB,SAAQ,aAAa,CAAC,OAAO,CAAC;gBAC7C,MAAM,EAAE,MAAM;IAIpB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAwCzF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@emuanalytics/flow-engine-client",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.123",
|
|
4
4
|
"description": "Flow Engine Client",
|
|
5
5
|
"author": "Robin Summerhill <robin.summerhill@emu-analytics.com>",
|
|
6
6
|
"license": "Copyright 2018 Emu Analytics Limited",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"git add"
|
|
62
62
|
]
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "dc996d4bc5776f95f92091946fe0b5fbb1bc317d"
|
|
65
65
|
}
|