mobility-toolbox-js 2.0.0-beta.8 → 2.0.1-beta.13
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/api/RoutingAPI.js +15 -0
- package/api/RoutingAPI.test.js +25 -0
- package/api/StopsAPI.js +12 -0
- package/api/StopsAPI.test.js +22 -0
- package/api/TralisAPI.js +359 -0
- package/api/TralisAPI.test.js +67 -0
- package/{src/api/tralis → api}/TralisAPIUtils.js +2 -32
- package/api/index.js +3 -0
- package/{index.html → api/typedefs.js} +0 -0
- package/common/Tracker.js +93 -0
- package/common/api/HttpAPI.js +30 -0
- package/common/api/HttpAPI.test.js +50 -0
- package/common/api/WebSocketAPI.js +175 -0
- package/{src/api/tralis/WebSocketConnector.test.js → common/api/WebSocketAPI.test.js} +100 -145
- package/common/controls/Control.js +81 -0
- package/{src/common → common}/controls/Control.test.js +32 -43
- package/common/index.js +4 -0
- package/common/layers/Layer.js +213 -0
- package/{src/common → common}/layers/Layer.test.js +185 -244
- package/common/mixins/CopyrightMixin.js +24 -0
- package/common/mixins/SearchMixin.js +110 -0
- package/common/mixins/TralisLayerMixin.js +479 -0
- package/common/styles/index.js +4 -0
- package/{src/common → common}/styles/trackerDefaultStyle.js +39 -175
- package/common/styles/trackerDelayStyle.js +8 -0
- package/{src/common → common}/styles/trackerSimpleStyle.js +4 -8
- package/{src/common → common}/trackerConfig.js +61 -99
- package/common/trackerConfig.test.js +23 -0
- package/{src/doc/examples/ol-mapbox-layer.md → common/typedefs.js} +0 -0
- package/common/utils/createTrackerFilters.js +56 -0
- package/common/utils/createTrackerFilters.test.js +79 -0
- package/{src/common → common}/utils/getMapboxMapCopyrights.js +3 -16
- package/common/utils/getMapboxMapCopyrights.test.js +40 -0
- package/{src/common → common}/utils/getMapboxStyleUrl.js +3 -13
- package/{src/common → common}/utils/getVehiclePosition.js +3 -33
- package/common/utils/index.js +5 -0
- package/common/utils/removeDuplicate.js +8 -0
- package/common/utils/removeDuplicate.test.js +19 -0
- package/{src/common → common}/utils/sortByDelay.js +2 -7
- package/common/utils/timeUtils.js +20 -0
- package/common/utils/timeUtils.test.js +10 -0
- package/index.js +8 -0
- package/mapbox/controls/CopyrightControl.js +29 -0
- package/mapbox/controls/index.js +1 -0
- package/mapbox/index.js +4 -0
- package/mapbox/layers/Layer.js +57 -0
- package/mapbox/layers/Layer.test.js +182 -0
- package/mapbox/layers/TralisLayer.js +182 -0
- package/{src/mapbox → mapbox}/layers/TralisLayer.test.js +12 -14
- package/mapbox/layers/index.js +2 -0
- package/{src/mapbox → mapbox}/utils.js +7 -21
- package/mbt.js +50444 -0
- package/mbt.js.map +7 -0
- package/mbt.min.js +1005 -0
- package/mbt.min.js.map +7 -0
- package/ol/controls/CopyrightControl.js +42 -0
- package/ol/controls/CopyrightControl.test.js +165 -0
- package/ol/controls/RoutingControl.js +387 -0
- package/ol/controls/RoutingControl.test.js +151 -0
- package/ol/controls/StopFinderControl.js +10 -0
- package/ol/controls/StopFinderControl.test.js +48 -0
- package/ol/controls/index.js +3 -0
- package/ol/index.js +5 -0
- package/ol/layers/Layer.js +88 -0
- package/ol/layers/Layer.test.js +174 -0
- package/ol/layers/MapboxLayer.js +203 -0
- package/{src/ol → ol}/layers/MapboxLayer.test.js +58 -84
- package/ol/layers/MapboxStyleLayer.js +187 -0
- package/{src/ol → ol}/layers/MapboxStyleLayer.test.js +97 -128
- package/ol/layers/MaplibreLayer.js +139 -0
- package/ol/layers/RoutingLayer.js +61 -0
- package/{src/ol → ol}/layers/RoutingLayer.test.js +15 -24
- package/ol/layers/TralisLayer.js +185 -0
- package/ol/layers/TralisLayer.test.js +79 -0
- package/ol/layers/VectorLayer.js +22 -0
- package/{src/ol → ol}/layers/VectorLayer.test.js +34 -45
- package/ol/layers/WMSLayer.js +38 -0
- package/ol/layers/WMSLayer.test.js +76 -0
- package/ol/layers/index.js +8 -0
- package/{src/ol → ol}/styles/fullTrajectoryDelayStyle.js +11 -15
- package/ol/styles/fullTrajectoryStyle.js +43 -0
- package/ol/styles/index.js +2 -0
- package/package.json +34 -74
- package/.babelrc +0 -6
- package/.esdoc.json +0 -17
- package/.eslintignore +0 -1
- package/.github/workflows/conventional-pr-title.yml +0 -21
- package/.github/workflows/cypress.yml +0 -29
- package/.github/workflows/nodejs.yml +0 -28
- package/.husky/commit-msg +0 -4
- package/.husky/post-checkout +0 -4
- package/.husky/post-merge +0 -4
- package/.husky/post-rebase +0 -4
- package/.husky/pre-commit +0 -4
- package/.neutrinorc.js +0 -176
- package/.nvmrc +0 -1
- package/CHANGELOG.md +0 -10
- package/LICENSE +0 -21
- package/__mocks__/mapbox-gl.js +0 -81
- package/__mocks__/maplibre-gl.js +0 -81
- package/commitlint.config.js +0 -1
- package/cypress/fixtures/example.json +0 -5
- package/cypress/integration/examples/api.spec.js +0 -7
- package/cypress/integration/examples/examples.spec.js +0 -7
- package/cypress/integration/examples/navigation.spec.js +0 -29
- package/cypress/plugins/index.js +0 -21
- package/cypress/support/commands.js +0 -25
- package/cypress/support/index.js +0 -20
- package/cypress.json +0 -4
- package/data/fetchRoute.json +0 -292
- package/data/fetchTrajectories.json +0 -18
- package/data/fetchTrajectoryById.json +0 -3
- package/data/fetchTrajectoryStations.json +0 -18
- package/data/stopsSearch.json +0 -15
- package/documentation.yml +0 -4
- package/esdoc/README.md +0 -27
- package/esdoc/plugins/MyPlugin.js +0 -69
- package/esdoc/plugins/dynamic-property-plugin/Plugin.js +0 -50
- package/esdoc/plugins/externals-plugin/Plugin.js +0 -45
- package/esdoc/plugins/externals-plugin/externals.js +0 -96
- package/global-setup.js +0 -3
- package/indexweb.html +0 -49
- package/jest.config.js +0 -5
- package/pull_request_template.md +0 -17
- package/renovate.json +0 -4
- package/scripts/read-pkg-json.js +0 -22
- package/src/api/index.js +0 -3
- package/src/api/routing/RoutingAPI.js +0 -44
- package/src/api/routing/RoutingAPI.test.js +0 -41
- package/src/api/stops/StopsAPI.js +0 -41
- package/src/api/stops/StopsAPI.test.js +0 -34
- package/src/api/tralis/TralisAPI.js +0 -731
- package/src/api/tralis/TralisAPI.test.js +0 -75
- package/src/api/tralis/WebSocketConnector.js +0 -338
- package/src/api/tralis/typedefs.js +0 -81
- package/src/assets/Lato-Black.ttf +0 -0
- package/src/assets/Lato-BlackItalic.ttf +0 -0
- package/src/assets/Lato-Bold.ttf +0 -0
- package/src/assets/Lato-BoldItalic.ttf +0 -0
- package/src/assets/Lato-Italic.ttf +0 -0
- package/src/assets/Lato-Light.ttf +0 -0
- package/src/assets/Lato-LightItalic.ttf +0 -0
- package/src/assets/Lato-Regular.ttf +0 -0
- package/src/assets/Lato-Thin.ttf +0 -0
- package/src/assets/Lato-ThinItalic.ttf +0 -0
- package/src/assets/OFL.txt +0 -93
- package/src/common/Tracker.js +0 -197
- package/src/common/api/api.js +0 -64
- package/src/common/api/api.test.js +0 -68
- package/src/common/controls/Control.js +0 -146
- package/src/common/index.js +0 -5
- package/src/common/layers/Layer.js +0 -404
- package/src/common/mixins/CopyrightMixin.js +0 -48
- package/src/common/mixins/SearchMixin.js +0 -176
- package/src/common/mixins/TralisLayerMixin.js +0 -930
- package/src/common/styles/index.js +0 -4
- package/src/common/styles/trackerDelayStyle.js +0 -17
- package/src/common/trackerConfig.test.js +0 -25
- package/src/common/typedefs.js +0 -23
- package/src/common/utils/createTrackerFilters.js +0 -87
- package/src/common/utils/createTrackerFilters.test.js +0 -95
- package/src/common/utils/getMapboxMapCopyrights.test.js +0 -47
- package/src/common/utils/index.js +0 -5
- package/src/common/utils/removeDuplicate.js +0 -22
- package/src/common/utils/removeDuplicate.test.js +0 -22
- package/src/common/utils/timeUtils.js +0 -44
- package/src/common/utils/timeUtils.test.js +0 -16
- package/src/doc/App.js +0 -116
- package/src/doc/App.scss +0 -51
- package/src/doc/_redirects +0 -2
- package/src/doc/components/CodeSandboxButton.js +0 -103
- package/src/doc/components/Documentation.js +0 -40
- package/src/doc/components/Esdoc/Anchor.js +0 -57
- package/src/doc/components/Esdoc/ClassDoc.js +0 -272
- package/src/doc/components/Esdoc/DeprecatedHTML.js +0 -16
- package/src/doc/components/Esdoc/DetailDocs.js +0 -281
- package/src/doc/components/Esdoc/DetailHTML.js +0 -33
- package/src/doc/components/Esdoc/DirectSubclassHTML.js +0 -30
- package/src/doc/components/Esdoc/DocBuilderUtils.js +0 -694
- package/src/doc/components/Esdoc/DocLinkHTML.js +0 -62
- package/src/doc/components/Esdoc/DocsLinkHTML.js +0 -38
- package/src/doc/components/Esdoc/Esdoc.js +0 -63
- package/src/doc/components/Esdoc/EsdocContent.js +0 -51
- package/src/doc/components/Esdoc/EsdocNavigation.js +0 -13
- package/src/doc/components/Esdoc/EsdocSearch.js +0 -81
- package/src/doc/components/Esdoc/ExperimentalHTML.js +0 -17
- package/src/doc/components/Esdoc/ExtendsChainHTML.js +0 -32
- package/src/doc/components/Esdoc/FileDocLinkHTML.js +0 -60
- package/src/doc/components/Esdoc/IdentifiersDoc.js +0 -113
- package/src/doc/components/Esdoc/IndirectSubclassHTML.js +0 -30
- package/src/doc/components/Esdoc/InheritedSummaryDoc.js +0 -70
- package/src/doc/components/Esdoc/InheritedSummaryHTML.js +0 -38
- package/src/doc/components/Esdoc/MixinClassesHTML.js +0 -29
- package/src/doc/components/Esdoc/NavDoc.js +0 -112
- package/src/doc/components/Esdoc/OverrideMethod.js +0 -44
- package/src/doc/components/Esdoc/OverrideMethodDescription.js +0 -35
- package/src/doc/components/Esdoc/Properties.js +0 -89
- package/src/doc/components/Esdoc/README.md +0 -45
- package/src/doc/components/Esdoc/SignatureHTML.js +0 -123
- package/src/doc/components/Esdoc/SingleDoc.js +0 -31
- package/src/doc/components/Esdoc/SummaryDoc.js +0 -160
- package/src/doc/components/Esdoc/SummaryHTML.js +0 -96
- package/src/doc/components/Esdoc/TypeDocLinkHTML.js +0 -249
- package/src/doc/components/Esdoc/css/identifiers.css +0 -38
- package/src/doc/components/Esdoc/css/search.css +0 -76
- package/src/doc/components/Esdoc/css/style.css +0 -603
- package/src/doc/components/Esdoc/index.js +0 -7
- package/src/doc/components/Example.js +0 -153
- package/src/doc/components/Examples.js +0 -183
- package/src/doc/components/Home.js +0 -106
- package/src/doc/components/TrackerExample.js +0 -38
- package/src/doc/examples/assets/tralis-live-map/index.js +0 -11
- package/src/doc/examples/assets/tralis-live-map/s1kreis.svg +0 -105
- package/src/doc/examples/assets/tralis-live-map/s20kreis.svg +0 -101
- package/src/doc/examples/assets/tralis-live-map/s2kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s3kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s4kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s6kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s7kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s8kreis.svg +0 -93
- package/src/doc/examples/assets/tralis-live-map/unknown.svg +0 -107
- package/src/doc/examples/mb-copyright.html +0 -26
- package/src/doc/examples/mb-copyright.js +0 -37
- package/src/doc/examples/mb-tracker.html +0 -1
- package/src/doc/examples/mb-tracker.js +0 -39
- package/src/doc/examples/mb-tracker.md +0 -1
- package/src/doc/examples/mb-tralis.html +0 -1
- package/src/doc/examples/mb-tralis.js +0 -34
- package/src/doc/examples/ol-copyright.html +0 -26
- package/src/doc/examples/ol-copyright.js +0 -43
- package/src/doc/examples/ol-mapbox-layer.html +0 -1
- package/src/doc/examples/ol-mapbox-layer.js +0 -28
- package/src/doc/examples/ol-mapbox-style-layer.html +0 -12
- package/src/doc/examples/ol-mapbox-style-layer.js +0 -44
- package/src/doc/examples/ol-query.html +0 -32
- package/src/doc/examples/ol-query.js +0 -83
- package/src/doc/examples/ol-routing.html +0 -26
- package/src/doc/examples/ol-routing.js +0 -59
- package/src/doc/examples/ol-routing.md +0 -1
- package/src/doc/examples/ol-stop-finder.html +0 -15
- package/src/doc/examples/ol-stop-finder.js +0 -31
- package/src/doc/examples/ol-stop-finder.md +0 -1
- package/src/doc/examples/ol-tracker.html +0 -1
- package/src/doc/examples/ol-tracker.js +0 -44
- package/src/doc/examples/ol-tracker.md +0 -1
- package/src/doc/examples/ol-tralis.html +0 -5
- package/src/doc/examples/ol-tralis.js +0 -57
- package/src/doc/examples/tralis-live-map.html +0 -1
- package/src/doc/examples/tralis-live-map.js +0 -51
- package/src/doc/examples/tralis-live-map.md +0 -3
- package/src/doc/examples.js +0 -107
- package/src/doc/img/examples/live_tracker_mb.jpg +0 -0
- package/src/doc/img/examples/live_tracker_munich.jpg +0 -0
- package/src/doc/img/examples/live_tracker_ol.jpg +0 -0
- package/src/doc/img/examples/mapbox.jpg +0 -0
- package/src/doc/img/examples/mapbox_style.jpg +0 -0
- package/src/doc/img/examples/ol-copyright.png +0 -0
- package/src/doc/img/examples/query_objects.jpg +0 -0
- package/src/doc/img/examples/routing.jpg +0 -0
- package/src/doc/img/examples/simple_map.jpg +0 -0
- package/src/doc/img/examples/stops.jpg +0 -0
- package/src/doc/img/favico.ico +0 -0
- package/src/doc/index.js +0 -21
- package/src/iife.js +0 -7
- package/src/index.js +0 -10
- package/src/mapbox/controls/CopyrightControl.js +0 -58
- package/src/mapbox/controls/index.js +0 -2
- package/src/mapbox/index.js +0 -4
- package/src/mapbox/layers/Layer.js +0 -118
- package/src/mapbox/layers/Layer.test.js +0 -202
- package/src/mapbox/layers/TralisLayer.js +0 -329
- package/src/mapbox/layers/index.js +0 -2
- package/src/ol/README.md +0 -0
- package/src/ol/controls/CopyrightControl.js +0 -80
- package/src/ol/controls/CopyrightControl.test.js +0 -211
- package/src/ol/controls/RoutingControl.js +0 -752
- package/src/ol/controls/RoutingControl.test.js +0 -216
- package/src/ol/controls/StopFinderControl.js +0 -38
- package/src/ol/controls/StopFinderControl.test.js +0 -59
- package/src/ol/controls/index.js +0 -3
- package/src/ol/controls/snapshots/RoutingControlRouteGen10.json +0 -58
- package/src/ol/controls/snapshots/RoutingControlRouteGen100.json +0 -292
- package/src/ol/controls/snapshots/RoutingControlRouteGen30.json +0 -69
- package/src/ol/controls/snapshots/RoutingControlRouteGen5.json +0 -58
- package/src/ol/controls/snapshots/RoutingControlRouteOSM.json +0 -759
- package/src/ol/controls/snapshots/RoutingControlStation1.json +0 -60
- package/src/ol/controls/snapshots/RoutingControlStation2.json +0 -49
- package/src/ol/index.js +0 -5
- package/src/ol/layers/Layer.js +0 -193
- package/src/ol/layers/Layer.test.js +0 -197
- package/src/ol/layers/MapboxLayer.js +0 -378
- package/src/ol/layers/MapboxStyleLayer.js +0 -417
- package/src/ol/layers/MaplibreLayer.js +0 -280
- package/src/ol/layers/RoutingLayer.js +0 -91
- package/src/ol/layers/TralisLayer.js +0 -359
- package/src/ol/layers/TralisLayer.test.js +0 -97
- package/src/ol/layers/VectorLayer.js +0 -43
- package/src/ol/layers/WMSLayer.js +0 -80
- package/src/ol/layers/WMSLayer.test.js +0 -84
- package/src/ol/layers/index.js +0 -8
- package/src/ol/styles/fullTrajectoryStyle.js +0 -51
- package/src/ol/styles/index.js +0 -2
- package/src/setupTests.js +0 -15
- package/webpack.config.js +0 -6
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import qs from "query-string";
|
|
2
|
+
import BaseObject from "ol/Object";
|
|
3
|
+
class HttpApi extends BaseObject {
|
|
4
|
+
constructor(options = {}) {
|
|
5
|
+
super();
|
|
6
|
+
this.url = options.url;
|
|
7
|
+
this.apiKey = options.apiKey;
|
|
8
|
+
}
|
|
9
|
+
fetch(path, params, config) {
|
|
10
|
+
const urlParams = { ...params || {}, key: this.apiKey };
|
|
11
|
+
const clone = { ...urlParams };
|
|
12
|
+
Object.keys(urlParams).forEach((key) => (clone[key] === void 0 || clone[key] === null) && delete clone[key]);
|
|
13
|
+
if (!this.apiKey) {
|
|
14
|
+
return Promise.reject(new Error(`No apiKey defined for request to ${this.url}`));
|
|
15
|
+
}
|
|
16
|
+
return fetch(`${this.url}${path || ""}?${qs.stringify(clone)}`, config).then((response) => {
|
|
17
|
+
try {
|
|
18
|
+
return response.json().then((data) => {
|
|
19
|
+
if (data.error) {
|
|
20
|
+
throw new Error(data.error);
|
|
21
|
+
}
|
|
22
|
+
return data;
|
|
23
|
+
});
|
|
24
|
+
} catch (err) {
|
|
25
|
+
return Promise.reject(new Error(err));
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export default HttpApi;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import fetch from "jest-fetch-mock";
|
|
2
|
+
import API from "./HttpAPI";
|
|
3
|
+
let api;
|
|
4
|
+
describe("HttpAPI", () => {
|
|
5
|
+
beforeEach(() => {
|
|
6
|
+
global.fetch = fetch;
|
|
7
|
+
fetch.resetMocks();
|
|
8
|
+
api = new API({ url: "https://foo.ch", apiKey: "apiKey" });
|
|
9
|
+
});
|
|
10
|
+
describe("#fetch", () => {
|
|
11
|
+
test("should success", () => {
|
|
12
|
+
fetch.mockResponseOnce(JSON.stringify({ foo: "bar" }));
|
|
13
|
+
return api.fetch("/path", {
|
|
14
|
+
q: "Bern",
|
|
15
|
+
fooUndefined: void 0,
|
|
16
|
+
fooNull: null,
|
|
17
|
+
fooEmpty: ""
|
|
18
|
+
}).then((response) => {
|
|
19
|
+
expect(fetch.mock.calls[0][0]).toEqual("https://foo.ch/path?fooEmpty=&key=apiKey&q=Bern");
|
|
20
|
+
expect(response).toEqual({ foo: "bar" });
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
describe("should display error message", () => {
|
|
24
|
+
test("reject error", (done) => {
|
|
25
|
+
fetch.mockRejectOnce(new Error("Fake error message"));
|
|
26
|
+
return api.fetch().catch((err) => {
|
|
27
|
+
expect(err.name).toEqual("Error");
|
|
28
|
+
expect(err.message).toEqual("Fake error message");
|
|
29
|
+
done();
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
test("if the response is invalid json", (done) => {
|
|
33
|
+
fetch.mockResponseOnce("invalid json");
|
|
34
|
+
api.fetch().catch((err) => {
|
|
35
|
+
expect(err.name).toEqual("FetchError");
|
|
36
|
+
expect(err.message).toEqual("invalid json response body at reason: Unexpected token i in JSON at position 0");
|
|
37
|
+
done();
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
test("if the response contains an error message", (done) => {
|
|
41
|
+
fetch.mockResponseOnce('{"error":"foo2"}');
|
|
42
|
+
api.fetch().catch((err) => {
|
|
43
|
+
expect(err.name).toEqual("Error");
|
|
44
|
+
expect(err.message).toEqual("foo2");
|
|
45
|
+
done();
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
});
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
class WebSocketApi {
|
|
2
|
+
constructor() {
|
|
3
|
+
this.defineProperties();
|
|
4
|
+
}
|
|
5
|
+
defineProperties() {
|
|
6
|
+
Object.defineProperties(this, {
|
|
7
|
+
closed: {
|
|
8
|
+
get: () => !!(this.websocket && this.websocket.readyState === this.websocket.CLOSED)
|
|
9
|
+
},
|
|
10
|
+
closing: {
|
|
11
|
+
get: () => !!(this.websocket && this.websocket.readyState === this.websocket.CLOSING)
|
|
12
|
+
},
|
|
13
|
+
connecting: {
|
|
14
|
+
get: () => !!(this.websocket && this.websocket.readyState === this.websocket.CONNECTING)
|
|
15
|
+
},
|
|
16
|
+
open: {
|
|
17
|
+
get: () => !!(this.websocket && this.websocket.readyState === this.websocket.OPEN)
|
|
18
|
+
},
|
|
19
|
+
messagesOnOpen: {
|
|
20
|
+
value: [],
|
|
21
|
+
writable: true
|
|
22
|
+
},
|
|
23
|
+
subscriptions: {
|
|
24
|
+
value: [],
|
|
25
|
+
writable: true
|
|
26
|
+
},
|
|
27
|
+
subscribed: {
|
|
28
|
+
value: {},
|
|
29
|
+
writable: true
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
static getRequestString(method, params) {
|
|
34
|
+
let reqStr = `${method} ${params.channel}`;
|
|
35
|
+
reqStr += params.args ? ` ${params.args}` : "";
|
|
36
|
+
reqStr += params.id ? ` ${params.id}` : "";
|
|
37
|
+
return reqStr.trim();
|
|
38
|
+
}
|
|
39
|
+
connect(url, onOpen = () => {
|
|
40
|
+
}) {
|
|
41
|
+
if (this.websocket && !this.closed) {
|
|
42
|
+
this.websocket.close();
|
|
43
|
+
}
|
|
44
|
+
this.websocket = new WebSocket(url);
|
|
45
|
+
if (!this.open) {
|
|
46
|
+
this.websocket.addEventListener("open", () => {
|
|
47
|
+
onOpen();
|
|
48
|
+
this.subscribePreviousSubscriptions();
|
|
49
|
+
});
|
|
50
|
+
} else {
|
|
51
|
+
onOpen();
|
|
52
|
+
this.subscribePreviousSubscriptions();
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
close() {
|
|
56
|
+
if (this.websocket) {
|
|
57
|
+
this.websocket.onclose = null;
|
|
58
|
+
this.websocket.close();
|
|
59
|
+
this.websocket = null;
|
|
60
|
+
this.messagesOnOpen = [];
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
send(message) {
|
|
64
|
+
if (!this.websocket) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const send = () => {
|
|
68
|
+
this.websocket.send(message);
|
|
69
|
+
};
|
|
70
|
+
if (!this.open) {
|
|
71
|
+
if (!this.messagesOnOpen.includes(message)) {
|
|
72
|
+
this.messagesOnOpen.push(message);
|
|
73
|
+
this.websocket.addEventListener("open", () => {
|
|
74
|
+
this.messagesOnOpen = [];
|
|
75
|
+
send();
|
|
76
|
+
});
|
|
77
|
+
this.websocket.addEventListener("close", () => {
|
|
78
|
+
this.messagesOnOpen = [];
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
} else if (!this.messagesOnOpen.includes(message)) {
|
|
82
|
+
send();
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
listen(params, cb, errorCb) {
|
|
86
|
+
this.unlisten(params, cb);
|
|
87
|
+
const onMessage = (evt) => {
|
|
88
|
+
let data = {};
|
|
89
|
+
try {
|
|
90
|
+
data = JSON.parse(evt.data);
|
|
91
|
+
} catch (err) {
|
|
92
|
+
console.error("WebSocket: unable to parse JSON data", err, evt.data);
|
|
93
|
+
}
|
|
94
|
+
let source = params.channel;
|
|
95
|
+
source += params.args ? ` ${params.args}` : "";
|
|
96
|
+
const contents = data.source === "buffer" ? data.content : [data];
|
|
97
|
+
contents.forEach((content) => {
|
|
98
|
+
if (content?.source === source && (!params.id || params.id === data.client_reference)) {
|
|
99
|
+
cb(content);
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
};
|
|
103
|
+
if (this.websocket) {
|
|
104
|
+
this.websocket.addEventListener("message", onMessage);
|
|
105
|
+
if (errorCb) {
|
|
106
|
+
this.websocket.addEventListener("error", errorCb);
|
|
107
|
+
this.websocket.addEventListener("close", errorCb);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return { onMessageCb: onMessage, onErrorCb: errorCb };
|
|
111
|
+
}
|
|
112
|
+
unlisten(params, cb) {
|
|
113
|
+
if (!this.websocket) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
this.subscriptions.filter((s) => s.params.channel === params.channel && (!cb || s.cb === cb)).forEach(({ onMessageCb, onErrorCb }) => {
|
|
117
|
+
if (this.websocket) {
|
|
118
|
+
this.websocket.removeEventListener("message", onMessageCb);
|
|
119
|
+
if (onErrorCb) {
|
|
120
|
+
this.websocket.removeEventListener("error", onErrorCb);
|
|
121
|
+
this.websocket.removeEventListener("close", onErrorCb);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
get(params, cb, errorCb) {
|
|
127
|
+
const reqStr = WebSocketApi.getRequestString("GET", params);
|
|
128
|
+
this.send(reqStr);
|
|
129
|
+
this.listen(params, cb, errorCb);
|
|
130
|
+
}
|
|
131
|
+
subscribe(params, cb, errorCb, quiet = false) {
|
|
132
|
+
const { onMessageCb, onErrorCb } = this.listen(params, cb, errorCb);
|
|
133
|
+
const reqStr = WebSocketApi.getRequestString("", params);
|
|
134
|
+
const index = this.subscriptions.findIndex((subcr) => params.channel === subcr.params.channel && cb === subcr.cb);
|
|
135
|
+
const newSubscr = { params, cb, errorCb, onMessageCb, onErrorCb, quiet };
|
|
136
|
+
if (index > -1) {
|
|
137
|
+
this.subscriptions[index] = newSubscr;
|
|
138
|
+
} else {
|
|
139
|
+
this.subscriptions.push(newSubscr);
|
|
140
|
+
}
|
|
141
|
+
if (!this.subscribed[reqStr]) {
|
|
142
|
+
if (!newSubscr.quiet) {
|
|
143
|
+
this.send(`GET ${reqStr}`);
|
|
144
|
+
this.send(`SUB ${reqStr}`);
|
|
145
|
+
}
|
|
146
|
+
this.subscribed[reqStr] = true;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
unsubscribe(source, cb) {
|
|
150
|
+
const toRemove = this.subscriptions.filter((s) => s.params.channel === source && (!cb || s.cb === cb));
|
|
151
|
+
toRemove.forEach(({ onMessageCb, onErrorCb }) => {
|
|
152
|
+
if (this.websocket) {
|
|
153
|
+
this.websocket.removeEventListener("message", onMessageCb);
|
|
154
|
+
if (onErrorCb) {
|
|
155
|
+
this.websocket.removeEventListener("error", onErrorCb);
|
|
156
|
+
this.websocket.removeEventListener("close", onErrorCb);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
});
|
|
160
|
+
this.subscriptions = this.subscriptions.filter((s) => s.params.channel !== source || cb && s.cb !== cb);
|
|
161
|
+
if (source && this.subscribed[source] && !this.subscriptions.find((s) => s.params.channel === source) && toRemove.find((subscr) => !subscr.quiet)) {
|
|
162
|
+
this.send(`DEL ${source}`);
|
|
163
|
+
this.subscribed[source] = false;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
subscribePreviousSubscriptions() {
|
|
167
|
+
Object.keys(this.subscribed).forEach((key) => {
|
|
168
|
+
this.subscribed[key] = false;
|
|
169
|
+
});
|
|
170
|
+
[...this.subscriptions].forEach((s) => {
|
|
171
|
+
this.subscribe(s.params, s.cb, s.errorCb, s.quiet);
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
export default WebSocketApi;
|