Skip to content

Commit df67eeb

Browse files
davidbrochartdavidbrochart
committed
-
1 parent f416192 commit df67eeb

File tree

5 files changed

+123
-40
lines changed

5 files changed

+123
-40
lines changed

‎package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,8 @@
6565
"stylelint-prettier": "^3.0.0",
6666
"typedoc": "~0.23.28",
6767
"typescript": "~5.0.4"
68+
},
69+
"resolutions": {
70+
"@jupyter/ydoc": "file:.yalc/@jupyter/ydoc"
6871
}
6972
}

‎packages/docprovider/src/requests.ts‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,38 @@ export async function requestUndoRedo(
110110
): Promise<any> {
111111
const settings = ServerConnection.makeSettings();
112112
let url = URLExt.join(
113+
settings.baseUrl,
114+
DOC_FORK_URL,
115+
encodeURIComponent(roomid)
116+
);
117+
118+
url = url.concat(`?action=${action}&&steps=${steps}&&forkRoom=${forkRoom}`);
119+
120+
const body = { method: 'PUT' };
121+
122+
let response: Response;
123+
try {
124+
response = await ServerConnection.makeRequest(url, body, settings);
125+
} catch (error) {
126+
throw new ServerConnection.NetworkError(error as Error);
127+
}
128+
129+
let data: any = await response.text();
130+
131+
if (data.length > 0) {
132+
try {
133+
data = JSON.parse(data);
134+
} catch (error) {
135+
console.log('Not a JSON response body.', response);
136+
}
137+
}
138+
139+
if (!response.ok) {
140+
throw new ServerConnection.ResponseError(response, data.message || data);
141+
}
142+
143+
return data;
144+
}
113145

114146
export async function requestDocFork(
115147
roomid: string,
@@ -121,10 +153,6 @@ export async function requestDocFork(
121153
encodeURIComponent(roomid)
122154
);
123155

124-
url = url.concat(`?action=${action}&&steps=${steps}&&forkRoom=${forkRoom}`);
125-
126-
const body = { method: 'PUT' };
127-
=======
128156
const body = {method: 'PUT'};
129157

130158
let response: Response;
@@ -204,7 +232,6 @@ export async function requestDocDelete(
204232
method: 'DELETE',
205233
body: JSON.stringify({ fork_roomid: forkRoomid, root_roomid: rootRoomid })
206234
};
207-
>>>>>>> f64d251 (Support suggestions)
208235

209236
let response: Response;
210237
try {

‎packages/docprovider/src/yprovider.ts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ import { WebsocketProvider as YWebsocketProvider } from 'y-websocket';
1818
import { requestDocFork, requestDocSession } from './requests';
1919
import { IForkProvider } from './ydrive';
2020

21-
/**
22-
* An interface for a document provider.
23-
*/
24-
export interface IDocumentProvider extends IDisposable {
25-
/**
26-
* Returns a Promise that resolves when the document provider is ready.
27-
*/
28-
readonly ready: Promise<void>;
29-
}
30-
3121
/**
3222
* A class to provide Yjs synchronization over WebSocket.
3323
*
@@ -104,21 +94,6 @@ export class WebSocketProvider implements IDocumentProvider, IForkProvider {
10494
this._connect();
10595
}
10696

107-
private async _connect(): Promise<void> {
108-
const session = await requestDocSession(
109-
this._format,
110-
this._contentType,
111-
this._path
112-
);
113-
114-
const response = await requestDocFork(`${session.format}:${session.type}:${session.fileId}`);
115-
const forkId = response.roomId;
116-
this._sharedModel.currentRoomId = forkId;
117-
this._sharedModel.addFork(forkId);
118-
119-
return forkId;
120-
}
121-
12297
async fork(): Promise<string> {
12398
const session = await requestDocSession(
12499
this._format,

‎projects/jupyter-server-ydoc/jupyter_server_ydoc/handlers.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import asyncio
77
import json
88
import time
9-
import uuid
109
from logging import Logger
1110
from typing import Any
1211
from uuid import uuid4
@@ -36,8 +35,7 @@
3635

3736
YFILE = YDOCS["file"]
3837

39-
40-
SERVER_SESSION = str(uuid.uuid4())
38+
SERVER_SESSION = str(uuid4())
4139
FORK_DOCUMENTS = {}
4240

4341

‎yarn.lock‎

Lines changed: 87 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,13 +2224,6 @@ __metadata:
22242224
"@jupyter/ydoc@npm:^2.0.0 || ^3.0.0-a3":
22252225
version: 3.0.0-a4
22262226
resolution: "@jupyter/ydoc@npm:3.0.0-a4"
2227-
dependencies:
2228-
"@jupyterlab/nbformat": ^3.0.0 || ^4.0.0-alpha.21 || ^4.0.0
2229-
"@lumino/coreutils": ^1.11.0 || ^2.0.0
2230-
"@lumino/disposable": ^1.10.0 || ^2.0.0
2231-
"@lumino/signaling": ^1.10.0 || ^2.0.0
2232-
y-protocols: ^1.0.5
2233-
yjs: ^13.5.40
22342227
checksum: ccd4d8b3c46346e14e4e20f093c0147349c403f1a61d624bc01a95fb805f41c8c5c4db54c5c43c59dc2ef7aeebb53a451a7fc75875c144578bf180c0d20c1878
22352228
languageName: node
22362229
linkType: hard
@@ -2246,6 +2239,37 @@ __metadata:
22462239
y-protocols: ^1.0.5
22472240
yjs: ^13.5.40
22482241
checksum: f10268d4d990f454279e3908a172755ed5885fa81bb70c31bdf66923598b283d26491741bece137d1c348619861e9b7f8354296773fe5352b1915e69101a9fb0
2242+
=======
2243+
checksum: 18ec446906af603ec9a9b78d891e6b2967f5cb934ffc724e0ad0f1640af82d7f06f64123ecf53fffb202b9cc2f1f10e909b75df06e6df313a84865635112df07
2244+
languageName: node
2245+
linkType: hard
2246+
2247+
"@jupyterlab/application@npm:^4.0.0":
2248+
version: 4.2.5
2249+
resolution: "@jupyterlab/application@npm:4.2.5"
2250+
dependencies:
2251+
"@fortawesome/fontawesome-free": ^5.12.0
2252+
"@jupyterlab/apputils": ^4.3.5
2253+
"@jupyterlab/coreutils": ^6.2.5
2254+
"@jupyterlab/docregistry": ^4.2.5
2255+
"@jupyterlab/rendermime": ^4.2.5
2256+
"@jupyterlab/rendermime-interfaces": ^3.10.5
2257+
"@jupyterlab/services": ^7.2.5
2258+
"@jupyterlab/statedb": ^4.2.5
2259+
"@jupyterlab/translation": ^4.2.5
2260+
"@jupyterlab/ui-components": ^4.2.5
2261+
"@lumino/algorithm": ^2.0.1
2262+
"@lumino/application": ^2.3.1
2263+
"@lumino/commands": ^2.3.0
2264+
"@lumino/coreutils": ^2.1.2
2265+
"@lumino/disposable": ^2.1.2
2266+
"@lumino/messaging": ^2.0.1
2267+
"@lumino/polling": ^2.1.2
2268+
"@lumino/properties": ^2.0.1
2269+
"@lumino/signaling": ^2.1.2
2270+
"@lumino/widgets": ^2.3.2
2271+
checksum: c424ea191ef4da45eeae44e366e2b3cb23426cc72c0321226c83000c02b91fa7c4bc54978aa0b0e9416211cce9c17469204fc2b133cb2bec3d8896a0b2f75ce1
2272+
>>>>>>> 4b5fdf7 (-)
22492273
languageName: node
22502274
linkType: hard
22512275

@@ -2652,6 +2676,15 @@ __metadata:
26522676
languageName: node
26532677
linkType: hard
26542678

2679+
"@jupyterlab/nbformat@npm:^4.2.5":
2680+
version: 4.2.5
2681+
resolution: "@jupyterlab/nbformat@npm:4.2.5"
2682+
dependencies:
2683+
"@lumino/coreutils": ^2.1.2
2684+
checksum: b3ad2026969bfa59f8cfb7b1a991419f96f7e6dc8c4acf4ac166c210d7ab99631350c785e9b04350095488965d2824492c8adbff24a2e26db615457545426b3c
2685+
languageName: node
2686+
linkType: hard
2687+
26552688
"@jupyterlab/notebook@npm:^4.2.0":
26562689
version: 4.2.4
26572690
resolution: "@jupyterlab/notebook@npm:4.2.4"
@@ -2822,6 +2855,22 @@ __metadata:
28222855
languageName: node
28232856
linkType: hard
28242857

2858+
"@jupyterlab/statusbar@npm:^4.2.5":
2859+
version: 4.2.5
2860+
resolution: "@jupyterlab/statusbar@npm:4.2.5"
2861+
dependencies:
2862+
"@jupyterlab/ui-components": ^4.2.5
2863+
"@lumino/algorithm": ^2.0.1
2864+
"@lumino/coreutils": ^2.1.2
2865+
"@lumino/disposable": ^2.1.2
2866+
"@lumino/messaging": ^2.0.1
2867+
"@lumino/signaling": ^2.1.2
2868+
"@lumino/widgets": ^2.3.2
2869+
react: ^18.2.0
2870+
checksum: fa429b88a5bcd6889b9ac32b5f2500cb10a968cc636ca8dede17972535cc47454cb7fc96518fc8def76935f826b66b071752d0fd26afdacba579f6f3785e97b2
2871+
languageName: node
2872+
linkType: hard
2873+
28252874
"@jupyterlab/testing@npm:^4.0.0":
28262875
version: 4.2.4
28272876
resolution: "@jupyterlab/testing@npm:4.2.4"
@@ -2911,6 +2960,37 @@ __metadata:
29112960
languageName: node
29122961
linkType: hard
29132962

2963+
"@jupyterlab/ui-components@npm:^4.2.5":
2964+
version: 4.2.5
2965+
resolution: "@jupyterlab/ui-components@npm:4.2.5"
2966+
dependencies:
2967+
"@jupyter/react-components": ^0.15.3
2968+
"@jupyter/web-components": ^0.15.3
2969+
"@jupyterlab/coreutils": ^6.2.5
2970+
"@jupyterlab/observables": ^5.2.5
2971+
"@jupyterlab/rendermime-interfaces": ^3.10.5
2972+
"@jupyterlab/translation": ^4.2.5
2973+
"@lumino/algorithm": ^2.0.1
2974+
"@lumino/commands": ^2.3.0
2975+
"@lumino/coreutils": ^2.1.2
2976+
"@lumino/disposable": ^2.1.2
2977+
"@lumino/messaging": ^2.0.1
2978+
"@lumino/polling": ^2.1.2
2979+
"@lumino/properties": ^2.0.1
2980+
"@lumino/signaling": ^2.1.2
2981+
"@lumino/virtualdom": ^2.0.1
2982+
"@lumino/widgets": ^2.3.2
2983+
"@rjsf/core": ^5.13.4
2984+
"@rjsf/utils": ^5.13.4
2985+
react: ^18.2.0
2986+
react-dom: ^18.2.0
2987+
typestyle: ^2.0.4
2988+
peerDependencies:
2989+
react: ^18.2.0
2990+
checksum: 9d2b887910a3b0d41645388c5ac6183d6fd2f3af4567de9b077b2492b1a9380f98c4598a4ae6d1c3186624ed4f956bedf8ba37adb5f772c96555761384a93e1e
2991+
languageName: node
2992+
linkType: hard
2993+
29142994
"@lerna/child-process@npm:6.6.2":
29152995
version: 6.6.2
29162996
resolution: "@lerna/child-process@npm:6.6.2"

0 commit comments

Comments
 (0)