@darajs/core 1.12.4 → 1.12.5
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/api/websocket.d.ts +7 -2
- package/dist/api/websocket.d.ts.map +1 -1
- package/dist/api/websocket.js +29 -1
- package/dist/api/websocket.js.map +1 -1
- package/dist/{dara_core-1.12.4-py3-none-any.whl → dara_core-1.12.5-py3-none-any.whl} +0 -0
- package/dist/umd/dara.core.umd.js +40 -2
- package/package.json +10 -9
package/dist/api/websocket.d.ts
CHANGED
|
@@ -77,6 +77,10 @@ export interface CustomMessage {
|
|
|
77
77
|
message: {
|
|
78
78
|
data: any;
|
|
79
79
|
kind: string;
|
|
80
|
+
/** Optional ID, returned from server custom messages coming as a response for a custom client message */
|
|
81
|
+
__response_for?: string;
|
|
82
|
+
/** Optional ID, should be included as `__response_for` when the server responds to this message */
|
|
83
|
+
__rchan?: string;
|
|
80
84
|
};
|
|
81
85
|
type: 'custom';
|
|
82
86
|
}
|
|
@@ -88,7 +92,7 @@ export interface WebSocketClientInterface {
|
|
|
88
92
|
customMessages$: () => Observable<CustomMessage>;
|
|
89
93
|
getChannel: () => Promise<string>;
|
|
90
94
|
progressUpdates$: (...task_ids: string[]) => Observable<ProgressNotificationMessage>;
|
|
91
|
-
sendCustomMessage
|
|
95
|
+
sendCustomMessage(kind: string, data: any, awaitResponse?: boolean): Promise<CustomMessage | null>;
|
|
92
96
|
sendMessage(value: any, channel: string, chunkCount?: number): void;
|
|
93
97
|
sendVariable: (value: any, channel: string) => void;
|
|
94
98
|
serverErrors$: () => Observable<ServerErrorMessage>;
|
|
@@ -192,8 +196,9 @@ export declare class WebSocketClient implements WebSocketClientInterface {
|
|
|
192
196
|
*
|
|
193
197
|
* @param kind kind of custom message
|
|
194
198
|
* @param data custom message data
|
|
199
|
+
* @param awaitResponse whether to await a response for this message
|
|
195
200
|
*/
|
|
196
|
-
sendCustomMessage(kind: string, data: any):
|
|
201
|
+
sendCustomMessage(kind: string, data: any, awaitResponse?: boolean): Promise<CustomMessage | null>;
|
|
197
202
|
}
|
|
198
203
|
/**
|
|
199
204
|
* Set up websocket connection and handlers.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../js/api/websocket.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../js/api/websocket.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG3C,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOvD,UAAU,WAAW;IACjB,OAAO,EAAE;QACL,OAAO,EAAE,QAAQ,CAAC;KACrB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,eAAe;IACrB,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,oBAAY,UAAU;IAClB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,QAAQ,aAAa;CACxB;AAED,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACpC,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACjC,OAAO,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACnC,OAAO,EAAE;QACL,sCAAsC;QACtC,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;KAC9B,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE;QACL;;WAEG;QACH,MAAM,EAAE,UAAU,CAAC;QACnB;;WAEG;QACH,GAAG,EAAE,MAAM,CAAC;KACf,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE;QACL,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC;KACd,CAAC;IACF,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE;QACL,IAAI,EAAE,GAAG,CAAC;QACV,IAAI,EAAE,MAAM,CAAC;QACb,yGAAyG;QACzG,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,mGAAmG;QACnG,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,MAAM,gBAAgB,GACtB,WAAW,GACX,eAAe,GACf,uBAAuB,GACvB,2BAA2B,GAC3B,oBAAoB,GACpB,kBAAkB,GAClB,sBAAsB,GACtB,aAAa,GACb,mBAAmB,GACnB,aAAa,CAAC;AAuCpB,MAAM,WAAW,wBAAwB;IACrC,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,UAAU,CAAC,UAAU,CAAC,CAAC;IACjE,qBAAqB,IAAI,UAAU,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IACpE,QAAQ,EAAE,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IACnC,eAAe,EAAE,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;IACjD,UAAU,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,gBAAgB,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,UAAU,CAAC,2BAA2B,CAAC,CAAC;IACrF,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IACnG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpE,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,aAAa,EAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IACpD,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,UAAU,CAAC,oBAAoB,CAAC,CAAC;IACvE,kBAAkB,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,CAAC;IACtE,iBAAiB,EAAE,MAAM,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAC5D,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAClD;AAED;;;GAGG;AACH,qBAAa,eAAgB,YAAW,wBAAwB;;IAC5D,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEzB,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAErC,MAAM,EAAE,SAAS,CAAC;IAElB,KAAK,EAAE,MAAM,CAAC;IAEd,UAAU,EAAE,OAAO,CAAC;IAEpB,YAAY,EAAE,MAAM,IAAI,CAAC;IAEzB,WAAW,EAAE,MAAM,CAAC;gBAQR,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,UAAQ;IAcnE,UAAU,CAAC,WAAW,UAAQ,GAAG,SAAS;IAkD1C;;OAEG;IACH,OAAO,IAAI,IAAI;IAyBf;;OAEG;IACH,KAAK,IAAI,IAAI;IAMb;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,qBAAqB,IAAI,UAAU,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAOnE;;OAEG;IACH,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC;IAO9B;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC;IAOjE;;;;OAIG;IACH,gBAAgB,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,2BAA2B,CAAC;IAWhF;;;;OAIG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,oBAAoB,CAAC;IAOjE;;OAEG;IACH,aAAa,IAAI,UAAU,CAAC,kBAAkB,CAAC;IAI/C;;OAEG;IACH,iBAAiB,IAAI,UAAU,CAAC,sBAAsB,CAAC;IAIvD;;;;OAIG;IACH,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC;IAO5D;;OAEG;IACH,eAAe,IAAI,UAAU,CAAC,aAAa,CAAC;IAI5C;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAoB1C;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAI/C;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAanE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CA4C5G;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,eAAe,CAsBzF"}
|
package/dist/api/websocket.js
CHANGED
|
@@ -10,6 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
11
|
};
|
|
12
12
|
var _WebSocketClient_pingInterval, _WebSocketClient_socketUrl, _WebSocketClient_reconnectCount;
|
|
13
|
+
import { nanoid } from 'nanoid';
|
|
13
14
|
import { Subject } from 'rxjs';
|
|
14
15
|
import { filter, map, take } from 'rxjs/operators';
|
|
15
16
|
const interAttemptTimeout = 500;
|
|
@@ -269,9 +270,35 @@ export class WebSocketClient {
|
|
|
269
270
|
*
|
|
270
271
|
* @param kind kind of custom message
|
|
271
272
|
* @param data custom message data
|
|
273
|
+
* @param awaitResponse whether to await a response for this message
|
|
272
274
|
*/
|
|
273
|
-
sendCustomMessage(kind, data) {
|
|
275
|
+
sendCustomMessage(kind, data, awaitResponse = false) {
|
|
274
276
|
if (this.socket.readyState === WebSocket.OPEN) {
|
|
277
|
+
// if awaiting response, setup a subscription to the response channel
|
|
278
|
+
if (awaitResponse) {
|
|
279
|
+
const rchan = nanoid();
|
|
280
|
+
return new Promise((resolve) => {
|
|
281
|
+
const subscription = this.customMessages$()
|
|
282
|
+
.pipe()
|
|
283
|
+
.subscribe({
|
|
284
|
+
next: (msg) => {
|
|
285
|
+
if (msg.message.__response_for === rchan) {
|
|
286
|
+
resolve(msg);
|
|
287
|
+
subscription.unsubscribe();
|
|
288
|
+
}
|
|
289
|
+
},
|
|
290
|
+
});
|
|
291
|
+
this.socket.send(JSON.stringify({
|
|
292
|
+
message: {
|
|
293
|
+
data,
|
|
294
|
+
kind,
|
|
295
|
+
__rchan: rchan,
|
|
296
|
+
},
|
|
297
|
+
type: 'custom',
|
|
298
|
+
}));
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
// otherwise just fire and forget a message
|
|
275
302
|
this.socket.send(JSON.stringify({
|
|
276
303
|
message: {
|
|
277
304
|
data,
|
|
@@ -279,6 +306,7 @@ export class WebSocketClient {
|
|
|
279
306
|
},
|
|
280
307
|
type: 'custom',
|
|
281
308
|
}));
|
|
309
|
+
return Promise.resolve(null);
|
|
282
310
|
}
|
|
283
311
|
}
|
|
284
312
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../js/api/websocket.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAInD,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,CAAC;AAc1E,MAAM,CAAN,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;IACrB,6BAAe,CAAA;IACf,mCAAqB,CAAA;AACzB,CAAC,EALW,UAAU,KAAV,UAAU,QAKrB;
|
|
1
|
+
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../js/api/websocket.tsx"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -26409,6 +26409,19 @@ var __privateWrapper = (obj, member, setter, getter) => ({
|
|
|
26409
26409
|
}
|
|
26410
26410
|
}).call(commonjsGlobal$1);
|
|
26411
26411
|
})(lodash$2, lodash$2.exports);
|
|
26412
|
+
let nanoid = (size2 = 21) => crypto.getRandomValues(new Uint8Array(size2)).reduce((id, byte) => {
|
|
26413
|
+
byte &= 63;
|
|
26414
|
+
if (byte < 36) {
|
|
26415
|
+
id += byte.toString(36);
|
|
26416
|
+
} else if (byte < 62) {
|
|
26417
|
+
id += (byte - 26).toString(36).toUpperCase();
|
|
26418
|
+
} else if (byte > 62) {
|
|
26419
|
+
id += "-";
|
|
26420
|
+
} else {
|
|
26421
|
+
id += "_";
|
|
26422
|
+
}
|
|
26423
|
+
return id;
|
|
26424
|
+
}, "");
|
|
26412
26425
|
styled__default.default.span`
|
|
26413
26426
|
display: flex;
|
|
26414
26427
|
flex-direction: column;
|
|
@@ -29610,7 +29623,8 @@ var __privateWrapper = (obj, member, setter, getter) => ({
|
|
|
29610
29623
|
CodeComponentThemes2["LIGHT"] = "light";
|
|
29611
29624
|
})(CodeComponentThemes || (CodeComponentThemes = {}));
|
|
29612
29625
|
styled__default.default.pre`
|
|
29613
|
-
|
|
29626
|
+
overflow-x: auto;
|
|
29627
|
+
|
|
29614
29628
|
margin: 0;
|
|
29615
29629
|
padding: 1rem;
|
|
29616
29630
|
|
|
@@ -56561,8 +56575,31 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
56561
56575
|
);
|
|
56562
56576
|
}
|
|
56563
56577
|
}
|
|
56564
|
-
sendCustomMessage(kind, data) {
|
|
56578
|
+
sendCustomMessage(kind, data, awaitResponse = false) {
|
|
56565
56579
|
if (this.socket.readyState === WebSocket.OPEN) {
|
|
56580
|
+
if (awaitResponse) {
|
|
56581
|
+
const rchan = nanoid();
|
|
56582
|
+
return new Promise((resolve) => {
|
|
56583
|
+
const subscription = this.customMessages$().pipe().subscribe({
|
|
56584
|
+
next: (msg) => {
|
|
56585
|
+
if (msg.message.__response_for === rchan) {
|
|
56586
|
+
resolve(msg);
|
|
56587
|
+
subscription.unsubscribe();
|
|
56588
|
+
}
|
|
56589
|
+
}
|
|
56590
|
+
});
|
|
56591
|
+
this.socket.send(
|
|
56592
|
+
JSON.stringify({
|
|
56593
|
+
message: {
|
|
56594
|
+
data,
|
|
56595
|
+
kind,
|
|
56596
|
+
__rchan: rchan
|
|
56597
|
+
},
|
|
56598
|
+
type: "custom"
|
|
56599
|
+
})
|
|
56600
|
+
);
|
|
56601
|
+
});
|
|
56602
|
+
}
|
|
56566
56603
|
this.socket.send(
|
|
56567
56604
|
JSON.stringify({
|
|
56568
56605
|
message: {
|
|
@@ -56572,6 +56609,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
56572
56609
|
type: "custom"
|
|
56573
56610
|
})
|
|
56574
56611
|
);
|
|
56612
|
+
return Promise.resolve(null);
|
|
56575
56613
|
}
|
|
56576
56614
|
}
|
|
56577
56615
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darajs/core",
|
|
3
|
-
"version": "1.12.
|
|
3
|
+
"version": "1.12.5",
|
|
4
4
|
"description": "Dara Framework core",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"@babel/preset-env": "^7.23.0",
|
|
38
38
|
"@babel/preset-react": "^7.22.15",
|
|
39
39
|
"@babel/preset-typescript": "^7.23.0",
|
|
40
|
-
"@darajs/eslint-config": "1.12.
|
|
41
|
-
"@darajs/prettier-config": "1.12.
|
|
42
|
-
"@darajs/stylelint-config": "1.12.
|
|
40
|
+
"@darajs/eslint-config": "1.12.5",
|
|
41
|
+
"@darajs/prettier-config": "1.12.5",
|
|
42
|
+
"@darajs/stylelint-config": "1.12.5",
|
|
43
43
|
"@rollup/plugin-inject": "^4.0.4",
|
|
44
44
|
"@testing-library/dom": "^9.3.0",
|
|
45
45
|
"@testing-library/jest-dom": "^5.16.5",
|
|
@@ -79,10 +79,10 @@
|
|
|
79
79
|
"whatwg-fetch": "^3.6.2"
|
|
80
80
|
},
|
|
81
81
|
"dependencies": {
|
|
82
|
-
"@darajs/styled-components": "1.12.
|
|
83
|
-
"@darajs/ui-components": "1.12.
|
|
84
|
-
"@darajs/ui-notifications": "1.12.
|
|
85
|
-
"@darajs/ui-utils": "1.12.
|
|
82
|
+
"@darajs/styled-components": "1.12.5",
|
|
83
|
+
"@darajs/ui-components": "1.12.5",
|
|
84
|
+
"@darajs/ui-notifications": "1.12.5",
|
|
85
|
+
"@darajs/ui-utils": "1.12.5",
|
|
86
86
|
"@fortawesome/fontawesome-free": "~6.4.0",
|
|
87
87
|
"@recoiljs/refine": "^0.1.1",
|
|
88
88
|
"@tanstack/query-core": "^4.0.0",
|
|
@@ -93,6 +93,7 @@
|
|
|
93
93
|
"history": "^4.9.0",
|
|
94
94
|
"jwt-decode": "^3.1.2",
|
|
95
95
|
"lodash": "^4.17.21",
|
|
96
|
+
"nanoid": "^3.3.0",
|
|
96
97
|
"object-hash": "^3.0.0",
|
|
97
98
|
"polished": "^4.1.1",
|
|
98
99
|
"query-string": "^7.1.1",
|
|
@@ -118,5 +119,5 @@
|
|
|
118
119
|
"publishConfig": {
|
|
119
120
|
"access": "public"
|
|
120
121
|
},
|
|
121
|
-
"gitHead": "
|
|
122
|
+
"gitHead": "fbe700c3ac18c54e96491ddacaf4cf61e6db98d3"
|
|
122
123
|
}
|