Skip to content

Commit 6bd1f7c

Browse files
committed
wip
1 parent 21b14c9 commit 6bd1f7c

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

src/kernels/jupyter/jupyterUtils.ts

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,36 +140,39 @@ export function createJupyterConnectionInfo(
140140
const { ServerConnection } = require('@jupyterlab/services') as typeof import('@jupyterlab/services');
141141
const { deserialize, serialize } =
142142
require('@jupyterlab/services/lib/kernel/serialize') as typeof import('@jupyterlab/services/lib/kernel/serialize');
143-
const { supportedKernelWebSocketProtocols } =
144-
require('@jupyterlab/services/lib/kernel/messages') as typeof import('@jupyterlab/services/lib/kernel/messages');
143+
// const { supportedKernelWebSocketProtocols } =
144+
// require('@jupyterlab/services/lib/kernel/messages') as typeof import('@jupyterlab/services/lib/kernel/messages');
145145

146146
const serializer: import('@jupyterlab/services').ServerConnection.ISettings['serializer'] = {
147147
deserialize: (data: ArrayBuffer, protocol?: string) => {
148+
logger.trace(`Deserialize message ${typeof data} && ${data instanceof Buffer} with ${protocol}`);
148149
try {
149150
if (typeof data === 'string') {
150151
return deserialize(data, '');
151152
}
152153
return deserialize(data, protocol);
153154
} catch (ex) {
154155
logger.warn(`Failed to deserialize message protocol = ${protocol}`, ex);
155-
if (protocol) {
156-
return deserialize(data, supportedKernelWebSocketProtocols.v1KernelWebsocketJupyterOrg);
157-
} else {
158-
return deserialize(data, '');
159-
}
156+
throw ex;
157+
// if (protocol) {
158+
// return deserialize(data, supportedKernelWebSocketProtocols.v1KernelWebsocketJupyterOrg);
159+
// } else {
160+
// return deserialize(data, '');
161+
// }
160162
}
161163
},
162164
serialize: (msg: KernelMessage.IMessage, protocol?: string) => {
163-
try {
164-
return serialize(msg, protocol);
165-
} catch (ex) {
166-
logger.warn(`Failed to serialize message protocol = ${protocol}`, ex);
167-
if (protocol) {
168-
return serialize(msg, supportedKernelWebSocketProtocols.v1KernelWebsocketJupyterOrg);
169-
} else {
170-
return serialize(msg, '');
171-
}
172-
}
165+
logger.trace(`Serialize message ${typeof msg} && ${msg instanceof Buffer} with ${protocol}`);
166+
// try {
167+
return serialize(msg, protocol);
168+
// } catch (ex) {
169+
// logger.warn(`Failed to serialize message protocol = ${protocol}`, ex);
170+
// if (protocol) {
171+
// return serialize(msg, supportedKernelWebSocketProtocols.v1KernelWebsocketJupyterOrg);
172+
// } else {
173+
// return serialize(msg, '');
174+
// }
175+
// }
173176
}
174177
};
175178
// This replaces the WebSocket constructor in jupyter lab services with our own implementation

0 commit comments

Comments
 (0)