@clockworkdog/cogs-client 1.0.0-rc.5 → 1.0.0-rc.6
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/CogsConnection.js +12 -5
- package/dist/CogsConnection.js.map +1 -1
- package/dist/browser/index.js +13 -6
- package/package.json +1 -1
package/dist/CogsConnection.js
CHANGED
|
@@ -16,7 +16,7 @@ class CogsConnection {
|
|
|
16
16
|
this._timerState = null;
|
|
17
17
|
this.currentOutputPortValues = { ...outputPortValues };
|
|
18
18
|
const { useReconnectingWebsocket, path, pathParams } = websocketParametersFromUrl(document.location.href);
|
|
19
|
-
const socketUrl = `ws://${hostname}:${port}${path}
|
|
19
|
+
const socketUrl = `ws://${hostname}:${port}${path}${pathParams ? '?' + pathParams : ''}`;
|
|
20
20
|
this.websocket = useReconnectingWebsocket ? new reconnecting_websocket_1.default(socketUrl) : new WebSocket(socketUrl);
|
|
21
21
|
this.websocket.onopen = () => {
|
|
22
22
|
this.currentConfig = {}; // Received on open connection
|
|
@@ -127,13 +127,14 @@ class CogsConnection {
|
|
|
127
127
|
}
|
|
128
128
|
exports.default = CogsConnection;
|
|
129
129
|
function websocketParametersFromUrl(url) {
|
|
130
|
-
var _a, _b, _c;
|
|
130
|
+
var _a, _b, _c, _d, _e;
|
|
131
131
|
const parsedUrl = new URL(url);
|
|
132
132
|
const pathParams = new URLSearchParams(parsedUrl.searchParams);
|
|
133
133
|
const localClientId = pathParams.get('local_id');
|
|
134
134
|
const isSimulator = pathParams.get('simulator') === 'true';
|
|
135
|
+
const display = (_a = pathParams.get('display')) !== null && _a !== void 0 ? _a : '';
|
|
135
136
|
if (localClientId) {
|
|
136
|
-
const type = (
|
|
137
|
+
const type = (_b = pathParams.get('t')) !== null && _b !== void 0 ? _b : '';
|
|
137
138
|
pathParams.delete('local_id');
|
|
138
139
|
return {
|
|
139
140
|
path: `/client/local/${encodeURIComponent(localClientId)}`,
|
|
@@ -142,13 +143,19 @@ function websocketParametersFromUrl(url) {
|
|
|
142
143
|
};
|
|
143
144
|
}
|
|
144
145
|
else if (isSimulator) {
|
|
145
|
-
const name = (
|
|
146
|
+
const name = (_c = pathParams.get('name')) !== null && _c !== void 0 ? _c : '';
|
|
146
147
|
pathParams.delete('simulator');
|
|
147
148
|
pathParams.delete('name');
|
|
148
149
|
return { path: `/simulator/${encodeURIComponent(name)}`, pathParams, useReconnectingWebsocket: true };
|
|
149
150
|
}
|
|
151
|
+
else if (display) {
|
|
152
|
+
const displayIdIndex = (_d = pathParams.get('displayIdIndex')) !== null && _d !== void 0 ? _d : '';
|
|
153
|
+
pathParams.delete('display');
|
|
154
|
+
pathParams.delete('displayIdIndex');
|
|
155
|
+
return { path: `/display/${encodeURIComponent(display)}/${encodeURIComponent(displayIdIndex)}` };
|
|
156
|
+
}
|
|
150
157
|
else {
|
|
151
|
-
const serial = (
|
|
158
|
+
const serial = (_e = pathParams.get('serial')) !== null && _e !== void 0 ? _e : '';
|
|
152
159
|
pathParams.delete('serial');
|
|
153
160
|
return { path: `/client/${encodeURIComponent(serial)}`, pathParams };
|
|
154
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CogsConnection.js","sourceRoot":"","sources":["../src/CogsConnection.ts"],"names":[],"mappings":";;;;;AAAA,mDAAkG;AAClG,oFAA2D;AAE3D,yCAAkD;AAqBlD,MAAqB,cAAc;IAqCjC,YACE,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,GAAG,uBAAgB,KAA2C,EAAE,EAC7G,mBAA+C,SAAS;QA7BlD,gBAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QAEhC,kBAAa,GAA0B,EAAwC,CAAC,CAAC,8BAA8B;QAK/G,2BAAsB,GAA8B,EAA4C,CAAC,CAAC,8BAA8B;QAKhI,4BAAuB,GAA+B,EAA6C,CAAC,CAAC,0BAA0B;QAK/H,eAAU,GAAc,sBAAS,CAAC,KAAK,CAAC;QAKxC,gBAAW,GAAsB,IAAI,CAAC;QAS5C,IAAI,CAAC,uBAAuB,GAAG,EAAE,GAAG,gBAAgB,EAAE,CAAC;QACvD,MAAM,EAAE,wBAAwB,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,0BAA0B,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1G,MAAM,SAAS,GAAG,QAAQ,QAAQ,IAAI,IAAI,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"CogsConnection.js","sourceRoot":"","sources":["../src/CogsConnection.ts"],"names":[],"mappings":"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"}
|