Repository navigation
Expand file tree
/
Copy pathdiff_extract.txt
More file actions
executable file
·1531 lines (1531 loc) · 57 KB
/
Copy pathdiff_extract.txt
File metadata and controls
executable file
·1531 lines (1531 loc) · 57 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
224: diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
225: index 0b3f04c6..ebc57726 100644
226: --- a/.github/workflows/static.yml
227: +++ b/.github/workflows/static.yml
228: @@ -96,30 +96,35 @@ jobs:
229:
230: if (metadata.version !== 1) {
231: throw new Error("metadata.version !== 1");
232: }
233:
234: if (metadata.sourceSha !== process.env.SOURCE_SHA) {
235: throw new Error(
236: "metadata.sourceSha does not match source_sha",
237: );
238: }
239: +
240: + if (
241: + !Number.isSafeInteger(metadata.buildEpoch) ||
242: + metadata.buildEpoch <= 0
243: + ) {
244: + throw new Error("metadata.buildEpoch is not a positive safe integer");
245: + }
246: NODE
247:
248: - name: Verify artifacts
249: run: node source/scripts/verify-vfs-asset.mjs site
250:
251: - - name: Remove .rubrc-pages-build.json
252: - run: rm -f site/.rubrc-pages-build.json
253: -
254: - - name: Confirm index.html and v1/index.html
255: + - name: Confirm deployment files
256: run: |
257: + test -f site/.rubrc-pages-build.json
258: test -f site/index.html
259: test -f site/v1/index.html
260:
261: - name: Setup Pages
262: uses: actions/configure-pages@v5
263:
264: - name: Upload artifact
265: uses: actions/upload-pages-artifact@v3
266: with:
267: path: 'site'
796: diff --git a/crates/vfs-shell/src/sysroot_extraction.rs b/crates/vfs-shell/src/sysroot_extraction.rs
797: new file mode 100644
798: index 00000000..53a4e1e1
799: --- /dev/null
800: +++ b/crates/vfs-shell/src/sysroot_extraction.rs
801: @@ -0,0 +1,173 @@
802: +use std::path::{Component, Path, PathBuf};
803: +use std::sync::Mutex;
804: +
805: +static SYSROOT_LOAD_LOCK: Mutex<()> = Mutex::new(());
806: +
807: +pub(crate) fn with_sysroot_load_lock<T>(
808: + operation: impl FnOnce() -> Result<T, String>,
809: +) -> Result<T, String> {
810: + let _guard = SYSROOT_LOAD_LOCK
811: + .lock()
812: + .map_err(|_| "sysroot load lock was poisoned".to_string())?;
813: + operation()
814: +}
815: +
816: +pub(crate) fn sysroot_meta_has_file(status: i32, triple: &str) -> Result<bool, String> {
817: + match status {
818: + 1 => Ok(true),
819: + 0 => Ok(false),
820: + -1 => Err(format!("failed to fetch sysroot archive for '{triple}'")),
821: + _ => Err(format!(
822: + "invalid sysroot archive status {status} for '{triple}'"
823: + )),
824: + }
825: +}
826: +
827: +pub(crate) fn sysroot_entry_path(base_dir: &Path, name: &str) -> Result<PathBuf, String> {
828: + if name == "." || name == "./" {
829: + return Ok(base_dir.to_path_buf());
830: + }
831: + let mut relative = PathBuf::new();
832: + for component in Path::new(name).components() {
833: + match component {
834: + Component::Normal(part) => relative.push(part),
835: + Component::CurDir => {}
836: + Component::ParentDir | Component::RootDir | Component::Prefix(_) => {
837: + return Err(format!("unsafe sysroot archive entry: {name}"));
838: + }
839: + }
840: + }
841: + if relative.as_os_str().is_empty() {
842: + return Err(format!("unsafe sysroot archive entry: {name}"));
843: + }
844: + Ok(base_dir.join(relative))
845: +}
846: +
847: +pub(crate) fn write_sysroot_entry(
848: + base_dir: &Path,
849: + name_bytes: Vec<u8>,
850: + data: Option<&[u8]>,
851: +) -> Result<(), String> {
852: + let name = String::from_utf8(name_bytes)
853: + .map_err(|error| format!("failed to decode sysroot file name: {error}"))?;
854: + let file_path = sysroot_entry_path(base_dir, &name)?;
855: + match data {
856: + None => std::fs::create_dir_all(&file_path)
857: + .map_err(|error| format!("failed to create sysroot directory '{name}': {error}")),
858: + Some(data) => {
859: + if let Some(parent) = file_path.parent() {
860: + std::fs::create_dir_all(parent).map_err(|error| {
861: + format!("failed to create parent directory for sysroot file '{name}': {error}")
862: + })?;
863: + }
864: + std::fs::write(&file_path, data)
865: + .map_err(|error| format!("failed to write sysroot file '{name}': {error}"))
866: + }
867: + }
868: +}
869: +
870: +#[cfg(test)]
871: +mod tests {
872: + use super::{
873: + sysroot_entry_path, sysroot_meta_has_file, with_sysroot_load_lock, write_sysroot_entry,
874: + };
875: + use std::fs;
876: + use std::path::PathBuf;
877: + use std::sync::atomic::{AtomicUsize, Ordering};
878: + use std::sync::{Arc, Barrier};
879: + use std::time::Duration;
880: +
881: + static NEXT_TEMP: AtomicUsize = AtomicUsize::new(0);
882: +
883: + fn temp_path(label: &str) -> PathBuf {
884: + std::env::temp_dir().join(format!(
885: + "rubrc-sysroot-{label}-{}-{}",
886: + std::process::id(),
887: + NEXT_TEMP.fetch_add(1, Ordering::Relaxed)
888: + ))
889: + }
890: +
891: + #[test]
892: + fn rejects_absolute_parent_and_nested_escape_paths() {
893: + let base = PathBuf::from("/sysroot/lib");
894: + for name in ["/absolute", "..", "../escape", "nested/../../escape"] {
895: + assert!(
896: + sysroot_entry_path(&base, name).is_err(),
897: + "accepted unsafe entry {name}"
898: + );
899: + }
900: + }
901: +
902: + #[test]
903: + fn accepts_archive_root_directory_marker() {
904: + let base = PathBuf::from("/sysroot/lib");
905: + assert_eq!(sysroot_entry_path(&base, ".").unwrap(), base);
906: + }
907: +
908: + #[test]
909: + fn rejects_invalid_utf8_file_names() {
910: + let error = write_sysroot_entry(&PathBuf::from("/sysroot/lib"), vec![0xff], Some(&[1]))
911: + .unwrap_err();
912: + assert!(error.contains("decode"), "unexpected error: {error}");
913: + }
914: +
915: + #[test]
916: + fn propagates_directory_creation_failure() {
917: + let base = temp_path("directory-error");
918: + fs::write(&base, b"not a directory").unwrap();
919: + let result = write_sysroot_entry(&base, b"nested".to_vec(), None);
920: + let _ = fs::remove_file(&base);
921: + assert!(result.is_err());
922: + }
923: +
924: + #[test]
925: + fn propagates_file_write_failure() {
926: + let base = temp_path("write-error");
927: + fs::create_dir_all(base.join("existing-directory")).unwrap();
928: + let result = write_sysroot_entry(
929: + &base,
930: + b"existing-directory".to_vec(),
931: + Some(b"file contents"),
932: + );
933: + let _ = fs::remove_dir_all(&base);
934: + assert!(result.is_err());
935: + }
936: +
937: + #[test]
938: + fn serializes_complete_sysroot_transactions() {
939: + let start = Arc::new(Barrier::new(5));
940: + let active = Arc::new(AtomicUsize::new(0));
941: + let maximum = Arc::new(AtomicUsize::new(0));
942: + let workers = (0..4)
943: + .map(|_| {
944: + let start = Arc::clone(&start);
945: + let active = Arc::clone(&active);
946: + let maximum = Arc::clone(&maximum);
947: + std::thread::spawn(move || {
948: + start.wait();
949: + with_sysroot_load_lock(|| {
950: + let current = active.fetch_add(1, Ordering::SeqCst) + 1;
951: + maximum.fetch_max(current, Ordering::SeqCst);
952: + std::thread::sleep(Duration::from_millis(5));
953: + active.fetch_sub(1, Ordering::SeqCst);
954: + Ok(())
955: + })
956: + .unwrap();
957: + })
958: + })
959: + .collect::<Vec<_>>();
960: + start.wait();
961: + for worker in workers {
962: + worker.join().unwrap();
963: + }
964: + assert_eq!(maximum.load(Ordering::SeqCst), 1);
965: + }
966: +
967: + #[test]
968: + fn failed_host_archive_status_fails_the_extraction() {
969: + assert!(sysroot_meta_has_file(1, "rust-src").unwrap());
970: + assert!(!sysroot_meta_has_file(0, "rust-src").unwrap());
971: + let error = sysroot_meta_has_file(-1, "rust-src").unwrap_err();
972: + assert!(error.contains("rust-src"), "unexpected error: {error}");
973: + }
974: +}
11776: diff --git a/lib/src/fetch_compressed_stream.ts b/lib/src/fetch_compressed_stream.ts
11777: new file mode 100644
11778: index 00000000..8dc4694c
11779: --- /dev/null
11780: +++ b/lib/src/fetch_compressed_stream.ts
11781: @@ -0,0 +1,99 @@
11782: +import {
11783: + type FetchInput,
11784: + type FetchWithOptionalCacheDependencies,
11785: + fetchWithOptionalCache,
11786: +} from "./fetch_with_optional_cache.ts";
11787: +
11788: +const ACCEPTED_COMPRESSED_CONTENT_TYPES = new Set([
11789: + "application/octet-stream",
11790: + "application/brotli",
11791: + "application/x-brotli",
11792: +]);
11793: +const HTTP_TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
11794: +
11795: +export type FetchCompressedStreamDependencies = Omit<
11796: + FetchWithOptionalCacheDependencies,
11797: + "acceptResponse"
11798: +> & {
11799: + getDecompressStream(): Promise<TransformStream<Uint8Array, Uint8Array>>;
11800: +};
11801: +
11802: +function mediaType(response: Response): string | null {
11803: + const contentType = response.headers.get("content-type");
11804: + if (contentType === null || contentType.includes(",")) return null;
11805: +
11806: + const [rawType, ...rawParameters] = contentType.split(";");
11807: + const typeParts = rawType.trim().split("/");
11808: + if (
11809: + typeParts.length !== 2 ||
11810: + !HTTP_TOKEN.test(typeParts[0]) ||
11811: + !HTTP_TOKEN.test(typeParts[1])
11812: + ) {
11813: + return null;
11814: + }
11815: + for (const rawParameter of rawParameters) {
11816: + const separator = rawParameter.indexOf("=");
11817: + if (separator < 1) return null;
11818: + const name = rawParameter.slice(0, separator).trim();
11819: + const value = rawParameter.slice(separator + 1).trim();
11820: + if (!HTTP_TOKEN.test(name) || !HTTP_TOKEN.test(value)) return null;
11821: + }
11822: +
11823: + return typeParts.join("/").toLowerCase();
11824: +}
11825: +
11826: +export function isAcceptedCompressedResponse(response: Response): boolean {
11827: + const type = mediaType(response);
11828: + return type !== null && ACCEPTED_COMPRESSED_CONTENT_TYPES.has(type);
11829: +}
11830: +
11831: +function requestUrl(input: FetchInput): string {
11832: + if (typeof input === "string") return input;
11833: + if (input instanceof URL) return input.href;
11834: + return input.url;
11835: +}
11836: +
11837: +export async function fetchCompressedStream(
11838: + url: FetchInput,
11839: + signal: AbortSignal | undefined,
11840: + dependencies: FetchCompressedStreamDependencies,
11841: +): Promise<ReadableStream<Uint8Array>> {
11842: + const response = await fetchWithOptionalCache(
11843: + url,
11844: + signal === undefined ? undefined : { signal },
11845: + {
11846: + cacheStorage: dependencies.cacheStorage,
11847: + fetch: dependencies.fetch,
11848: + reportCacheError: dependencies.reportCacheError,
11849: + acceptResponse: isAcceptedCompressedResponse,
11850: + },
11851: + );
11852: +
11853: + if (!response.ok) {
11854: + await response.body?.cancel().catch(() => undefined);
11855: + throw new Error("Failed to fetch wasm");
11856: + }
11857: + if (!isAcceptedCompressedResponse(response)) {
11858: + const contentType = response.headers.get("content-type");
11859: + await response.body?.cancel().catch(() => undefined);
11860: + const reason =
11861: + contentType === null
11862: + ? "missing Content-Type"
11863: + : `unsupported Content-Type ${JSON.stringify(contentType)}`;
11864: + throw new Error(
11865: + `Invalid compressed asset response for ${requestUrl(url)}: ${reason}`,
11866: + );
11867: + }
11868: + if (!response.body) {
11869: + throw new Error("No body in response");
11870: + }
11871: +
11872: + let decompressStream: TransformStream<Uint8Array, Uint8Array>;
11873: + try {
11874: + decompressStream = await dependencies.getDecompressStream();
11875: + } catch (error) {
11876: + await response.body.cancel().catch(() => undefined);
11877: + throw error;
11878: + }
11879: + return response.body.pipeThrough(decompressStream);
11880: +}
12180: diff --git a/lib/src/fetch_with_optional_cache.ts b/lib/src/fetch_with_optional_cache.ts
12181: new file mode 100644
12182: index 00000000..4b8145ac
12183: --- /dev/null
12184: +++ b/lib/src/fetch_with_optional_cache.ts
12185: @@ -0,0 +1,84 @@
12186: +export type FetchInput = string | URL | Request;
12187: +
12188: +export interface CacheBoundary {
12189: + match(input: FetchInput): Promise<Response | undefined>;
12190: + delete(input: FetchInput): Promise<boolean>;
12191: + put(input: FetchInput, response: Response): Promise<void>;
12192: +}
12193: +
12194: +export interface CacheStorageBoundary {
12195: + open(name: string): Promise<CacheBoundary>;
12196: +}
12197: +
12198: +export interface FetchWithOptionalCacheDependencies {
12199: + cacheStorage?: CacheStorageBoundary;
12200: + fetch(input: FetchInput, init?: RequestInit): Promise<Response>;
12201: + reportCacheError(error: unknown): void;
12202: + acceptResponse?: (response: Response) => boolean;
12203: +}
12204: +
12205: +export async function fetchWithOptionalCache(
12206: + input: FetchInput,
12207: + init: RequestInit | undefined,
12208: + dependencies: FetchWithOptionalCacheDependencies,
12209: +): Promise<Response> {
12210: + const {
12211: + cacheStorage,
12212: + fetch,
12213: + reportCacheError,
12214: + acceptResponse = () => true,
12215: + } = dependencies;
12216: + const method =
12217: + init?.method ?? (input instanceof Request ? input.method : "GET");
12218: + if (method.toUpperCase() !== "GET") {
12219: + return await fetch(input, init);
12220: + }
12221: + if (!cacheStorage) return await fetch(input, init);
12222: + const cacheInput = new Request(input, init);
12223: + const responseIsAccepted = async (response: Response): Promise<boolean> => {
12224: + try {
12225: + return acceptResponse(response);
12226: + } catch (error) {
12227: + await response.body?.cancel().catch(() => undefined);
12228: + throw error;
12229: + }
12230: + };
12231: +
12232: + let cache: CacheBoundary;
12233: + try {
12234: + cache = await cacheStorage.open("rubrc-assets-v1");
12235: + } catch (error) {
12236: + reportCacheError(error);
12237: + return await fetch(input, init);
12238: + }
12239: +
12240: + let cachedResponse: Response | undefined;
12241: + try {
12242: + cachedResponse = await cache.match(cacheInput);
12243: + } catch (error) {
12244: + reportCacheError(error);
12245: + return await fetch(input, init);
12246: + }
12247: +
12248: + if (cachedResponse) {
12249: + if (cachedResponse.ok && (await responseIsAccepted(cachedResponse))) {
12250: + return cachedResponse;
12251: + }
12252: + await cachedResponse.body?.cancel().catch(() => undefined);
12253: + try {
12254: + await cache.delete(cacheInput);
12255: + } catch (error) {
12256: + reportCacheError(error);
12257: + }
12258: + }
12259: +
12260: + const response = await fetch(input, init);
12261: + if (response.ok && (await responseIsAccepted(response))) {
12262: + const cacheResponse = response.clone();
12263: + void cache.put(cacheInput, cacheResponse).catch(async (error) => {
12264: + await cacheResponse.body?.cancel().catch(() => undefined);
12265: + reportCacheError(error);
12266: + });
12267: + }
12268: + return response;
12269: +}
26315: diff --git a/page/src/rust_src_cache.ts b/page/src/rust_src_cache.ts
26316: new file mode 100644
26317: index 00000000..b04043ce
26318: --- /dev/null
26319: +++ b/page/src/rust_src_cache.ts
26320: @@ -0,0 +1,81 @@
26321: +type FetchInput = string | URL | Request;
26322: +
26323: +type RustSrcCache = {
26324: + keys(): Promise<readonly Request[]>;
26325: + delete(request: Request): Promise<boolean>;
26326: +};
26327: +
26328: +export type RustSrcCacheDependencies = {
26329: + cacheStorage?: { open(name: string): Promise<RustSrcCache> };
26330: + fetch(input: FetchInput, init?: RequestInit): Promise<Response>;
26331: + reportError(error: unknown): void;
26332: +};
26333: +
26334: +function cacheBuildEpoch(url: URL): number | undefined {
26335: + const values = url.searchParams.getAll("build");
26336: + if (values.length === 0) return 0;
26337: + if (values.length !== 1 || !/^(0|[1-9]\d*)$/.test(values[0])) {
26338: + return undefined;
26339: + }
26340: + const value = Number(values[0]);
26341: + return Number.isSafeInteger(value) ? value : undefined;
26342: +}
26343: +
26344: +export async function pruneRustSrcCacheVariants(
26345: + archiveUrl: string,
26346: + sourceRevision: string,
26347: + dependencies: RustSrcCacheDependencies,
26348: +): Promise<void> {
26349: + try {
26350: + const cacheStorage = dependencies.cacheStorage;
26351: + if (!cacheStorage) return;
26352: + const current = new URL(
26353: + archiveUrl,
26354: + typeof location === "undefined"
26355: + ? "https://development.invalid/"
26356: + : location.href,
26357: + );
26358: + const currentBuildEpoch = cacheBuildEpoch(current);
26359: + const cache = await cacheStorage.open("rubrc-assets-v1");
26360: + const requests = await cache.keys();
26361: + const metadataUrl = new URL(".rubrc-pages-build.json", current);
26362: + const response = await dependencies.fetch(metadataUrl, {
26363: + cache: "no-store",
26364: + });
26365: + if (!response.ok) return;
26366: + const metadata: unknown = await response.json();
26367: + if (
26368: + typeof metadata !== "object" ||
26369: + metadata === null ||
26370: + !("version" in metadata) ||
26371: + metadata.version !== 1 ||
26372: + !("sourceSha" in metadata) ||
26373: + metadata.sourceSha !== sourceRevision ||
26374: + !("buildEpoch" in metadata) ||
26375: + typeof metadata.buildEpoch !== "number" ||
26376: + !Number.isSafeInteger(metadata.buildEpoch) ||
26377: + metadata.buildEpoch <= 0 ||
26378: + metadata.buildEpoch !== currentBuildEpoch
26379: + )
26380: + return;
26381: +
26382: + for (const request of requests) {
26383: + const candidate = new URL(request.url);
26384: + if (
26385: + candidate.origin === current.origin &&
26386: + candidate.pathname === current.pathname &&
26387: + candidate.href !== current.href
26388: + ) {
26389: + const candidateBuildEpoch = cacheBuildEpoch(candidate);
26390: + if (
26391: + candidateBuildEpoch !== undefined &&
26392: + candidateBuildEpoch < metadata.buildEpoch
26393: + ) {
26394: + await cache.delete(request);
26395: + }
26396: + }
26397: + }
26398: + } catch (error) {
26399: + dependencies.reportError(error);
26400: + }
26401: +}
31283: diff --git a/page/vite.config.ts b/page/vite.config.ts
31284: index 553d7d0b..43baa8d6 100644
31285: --- a/page/vite.config.ts
31286: +++ b/page/vite.config.ts
31287: @@ -1,42 +1,187 @@
31288: -import { defineConfig } from "vite";
31289: +import { Buffer } from "node:buffer";
31290: +import { open, readFile } from "node:fs/promises";
31291: +import { pipeline } from "node:stream/promises";
31292: +import { fileURLToPath } from "node:url";
31293: +import importMetaUrlPlugin from "@codingame/esbuild-import-meta-url-plugin";
31294: +import tailwindcss from "@tailwindcss/vite";
31295: +import { defineConfig, type Plugin } from "vite";
31296: import solidPlugin from "vite-plugin-solid";
31297: -// import devtools from 'solid-devtools/vite';
31298: -import tailwindcss from '@tailwindcss/vite'
31299: -import importMetaUrlPlugin from '@codingame/esbuild-import-meta-url-plugin'
31300: -
31301: -export default defineConfig({
31302: - plugins: [
31303: - /*
31304: - Uncomment the following line to enable solid-devtools.
31305: - For more info see https://github.com/thetarnav/solid-devtools/tree/main/packages/extension#readme
31306: - */
31307: - // devtools(),
31308: - solidPlugin(),
31309: - tailwindcss(),
31310: - ],
31311: - optimizeDeps: {
31312: - exclude: ['brotli-dec-wasm'],
31313: - esbuildOptions: {
31314: - plugins: [
31315: - importMetaUrlPlugin
31316: - ]
31317: +
31318: +const crossOriginIsolationHeaders = {
31319: + "Cross-Origin-Embedder-Policy": "require-corp",
31320: + "Cross-Origin-Opener-Policy": "same-origin",
31321: +};
31322: +
31323: +const developmentRustSrcDirectory = fileURLToPath(
31324: + new URL("../.rubrc-cache/dev/", import.meta.url),
31325: +);
31326: +const developmentRustSrcSidecarPath = `${developmentRustSrcDirectory}/rust-src.sha256`;
31327: +
31328: +type DevelopmentRustSrcAsset = {
31329: + path: string;
31330: + sha256: string;
31331: +};
31332: +
31333: +async function readDevelopmentRustSrcAsset(): Promise<DevelopmentRustSrcAsset> {
31334: + const sha256 = (await readFile(developmentRustSrcSidecarPath, "utf8")).trim();
31335: + if (!/^[a-f0-9]{64}$/.test(sha256)) {
31336: + throw new Error(
31337: + `invalid development rust-src SHA-256 in ${developmentRustSrcSidecarPath}`,
31338: + );
31339: + }
31340: + return {
31341: + path: `${developmentRustSrcDirectory}/rust-src-${sha256}.tar.vfsbr`,
31342: + sha256,
31343: + };
31344: +}
31345: +
31346: +function developmentRustSrcPlugin(asset: DevelopmentRustSrcAsset): Plugin {
31347: + return {
31348: + name: "rubrc-development-rust-src",
31349: + apply: "serve",
31350: + configureServer(server) {
31351: + server.middlewares.use((request, response, next) => {
31352: + void serveDevelopmentRustSrcAsset(request, response, next, asset).catch(
31353: + (error) => {
31354: + if (!response.destroyed) next(error);
31355: + },
31356: + );
31357: + });
31358: + },
31359: + };
31360: +}
31361: +
31362: +async function serveDevelopmentRustSrcAsset(
31363: + request: import("node:http").IncomingMessage,
31364: + response: import("node:http").ServerResponse,
31365: + next: (error?: unknown) => void,
31366: + asset: DevelopmentRustSrcAsset,
31367: +): Promise<void> {
31368: + if (request.method !== "GET" && request.method !== "HEAD") {
31369: + next();
31370: + return;
31371: + }
31372: + const rawUrl = request.url;
31373: + if (!rawUrl?.startsWith("/") || rawUrl.startsWith("//")) {
31374: + next();
31375: + return;
31376: + }
31377: + const requestUrl = new URL(rawUrl, "http://localhost");
31378: + if (requestUrl.pathname !== "/rust-src.tar.vfsbr") {
31379: + next();
31380: + return;
31381: + }
31382: + if (requestUrl.searchParams.get("v") !== asset.sha256) {
31383: + response.statusCode = 409;
31384: + response.setHeader("Content-Type", "text/plain; charset=utf-8");
31385: + const message = `rust-src development asset revision mismatch; expected ${asset.sha256}\n`;
31386: + response.setHeader("Content-Length", String(Buffer.byteLength(message)));
31387: + response.end(request.method === "HEAD" ? undefined : message);
31388: + return;
31389: + }
31390: +
31391: + const file = await open(asset.path, "r");
31392: + try {
31393: + const stat = await file.stat();
31394: + if (!stat.isFile()) {
31395: + throw new Error(
31396: + `development rust-src asset is not a regular file: ${asset.path}`,
31397: + );
31398: + }
31399: + if (response.destroyed) {
31400: + await file.close();
31401: + return;
31402: + }
31403: + response.statusCode = 200;
31404: + response.setHeader("Content-Type", "application/octet-stream");
31405: + response.setHeader("Content-Length", String(stat.size));
31406: + response.setHeader("Cache-Control", "public, max-age=31536000, immutable");
31407: + if (request.method === "HEAD") {
31408: + await file.close();
31409: + if (!response.destroyed) response.end();
31410: + return;
31411: }
31412: - },
31413: - server: {
31414: - port: 3000,
31415: - headers: {
31416: - "Cross-Origin-Embedder-Policy": "require-corp",
31417: - "Cross-Origin-Opener-Policy": "same-origin",
31418: + } catch (error) {
31419: + await file.close();
31420: + throw error;
31421: + }
31422: + let stream: ReturnType<typeof file.createReadStream>;
31423: + try {
31424: + stream = file.createReadStream();
31425: + } catch (error) {
31426: + await file.close();
31427: + throw error;
31428: + }
31429: + try {
31430: + await pipeline(stream, response);
31431: + } catch (error) {
31432: + if (
31433: + response.destroyed ||
31434: + (error instanceof Error &&
31435: + "code" in error &&
31436: + (error.code === "ECONNRESET" ||
31437: + error.code === "ERR_STREAM_PREMATURE_CLOSE"))
31438: + ) {
31439: + return;
31440: + }
31441: + if (response.headersSent) {
31442: + response.destroy(error instanceof Error ? error : undefined);
31443: + return;
31444: + }
31445: + throw error;
31446: + }
31447: +}
31448: +
31449: +export default defineConfig(async ({ command, isPreview }) => {
31450: + const isDevelopmentServer = command === "serve" && isPreview !== true;
31451: + const developmentRustSrcAsset = isDevelopmentServer
31452: + ? await readDevelopmentRustSrcAsset()
31453: + : undefined;
31454: + const productionSourceRevision = process.env.SOURCE_SHA ?? "development";
31455: + const sourceRevision =
31456: + developmentRustSrcAsset?.sha256 ?? productionSourceRevision;
31457: +
31458: + return {
31459: + define: {
31460: + __RUBRC_SOURCE_REVISION__: JSON.stringify(sourceRevision),
31461: + __RUBRC_BUILD_EPOCH__: JSON.stringify(process.env.BUILD_EPOCH ?? "0"),
31462: + },
31463: + resolve: {
31464: + alias: {
31465: + "monaco-editor": "@codingame/monaco-vscode-editor-api",
31466: + },
31467: + dedupe: [
31468: + "vscode",
31469: + "@codingame/monaco-vscode-api",
31470: + "@codingame/monaco-vscode-extension-api",
31471: + "@codingame/monaco-vscode-extensions-service-override",
31472: + ],
31473: + },
31474: + plugins: [
31475: + ...(developmentRustSrcAsset
31476: + ? [developmentRustSrcPlugin(developmentRustSrcAsset)]
31477: + : []),
31478: + solidPlugin(),
31479: + tailwindcss(),
31480: + ],
31481: + optimizeDeps: {
31482: + exclude: ["brotli-dec-wasm"],
31483: + esbuildOptions: {
31484: + plugins: [importMetaUrlPlugin],
31485: + },
31486: + },
31487: + server: {
31488: + port: 3000,
31489: + headers: crossOriginIsolationHeaders,
31490: + },
31491: + preview: { headers: crossOriginIsolationHeaders },
31492: + build: {
31493: + target: "esnext",
31494: + minify: process.env.NODE_ENV === "production" ? true : false,
31495: + },
31496: + worker: {
31497: + format: "es",
31498: },
31499: - },
31500: - build: {
31501: - target: "esnext",
31502: - // If use debug mode, not minify.
31503: - minify: process.env.NODE_ENV === "production" ? true : false
31504: - // produce sourcemaps for debug builds
31505: - },
31506: - worker: {
31507: - format: "es",
31508: - },
31509: - base: "./",
31510: + base: "./",
31511: + };
31512: });
32444: diff --git a/scripts/lsp_browser_static_server.mjs b/scripts/lsp_browser_static_server.mjs
32445: new file mode 100644
32446: index 00000000..6feec6e2
32447: --- /dev/null
32448: +++ b/scripts/lsp_browser_static_server.mjs
32449: @@ -0,0 +1,267 @@
32450: +import { createReadStream } from "node:fs";
32451: +import { open, realpath, stat } from "node:fs/promises";
32452: +import { createServer } from "node:http";
32453: +import { extname, isAbsolute, relative, resolve, sep } from "node:path";
32454: +import { pipeline } from "node:stream/promises";
32455: +import { fileURLToPath } from "node:url";
32456: +
32457: +const DEFAULT_ROOT = fileURLToPath(new URL("../page/dist/", import.meta.url));
32458: +const CROSS_ORIGIN_ISOLATION_HEADERS = {
32459: + "Cross-Origin-Embedder-Policy": "require-corp",
32460: + "Cross-Origin-Opener-Policy": "same-origin",
32461: +};
32462: +const CONTENT_TYPES = new Map([
32463: + [".html", "text/html; charset=utf-8"],
32464: + [".js", "text/javascript; charset=utf-8"],
32465: + [".mjs", "text/javascript; charset=utf-8"],
32466: + [".css", "text/css; charset=utf-8"],
32467: + [".wasm", "application/wasm"],
32468: + [".json", "application/json; charset=utf-8"],
32469: + [".vfsbr", "application/octet-stream"],
32470: +]);
32471: +
32472: +function isMissing(error) {
32473: + return (
32474: + error instanceof Error &&
32475: + "code" in error &&
32476: + (error.code === "ENOENT" || error.code === "ENOTDIR")
32477: + );
32478: +}
32479: +
32480: +function isClientAbort(error, request, response) {
32481: + return (
32482: + request.destroyed ||
32483: + response.destroyed ||
32484: + (error instanceof Error &&
32485: + "code" in error &&
32486: + (error.code === "ECONNRESET" ||
32487: + error.code === "ERR_STREAM_PREMATURE_CLOSE"))
32488: + );
32489: +}
32490: +
32491: +function endResponse(request, response, body = "") {
32492: + response.end(request.method === "HEAD" ? undefined : body);
32493: +}
32494: +
32495: +export function resolveStaticPath(rootDirectory, pathname) {
32496: + let decoded;
32497: + try {
32498: + decoded = decodeURIComponent(pathname);
32499: + } catch {
32500: + return null;
32501: + }
32502: + if (
32503: + !decoded.startsWith("/") ||
32504: + decoded.startsWith("//") ||
32505: + decoded.includes("\0")
32506: + ) {
32507: + return null;
32508: + }
32509: + const normalized = decoded.replaceAll("\\", "/");
32510: + if (normalized.split("/").includes("..")) return null;
32511: +
32512: + const root = resolve(rootDirectory);
32513: + const candidate = resolve(root, `.${normalized}`);
32514: + const relativePath = relative(root, candidate);
32515: + if (
32516: + relativePath === ".." ||
32517: + relativePath.startsWith(`..${sep}`) ||
32518: + isAbsolute(relativePath)
32519: + ) {
32520: + return null;
32521: + }
32522: + return candidate;
32523: +}
32524: +
32525: +async function safeRegularFile(canonicalRoot, path) {
32526: + let canonicalPath;
32527: + try {
32528: + canonicalPath = await realpath(path);
32529: + } catch (error) {
32530: + if (isMissing(error)) return null;
32531: + throw error;
32532: + }
32533: + if (
32534: + !canonicalPath.startsWith(canonicalRoot + sep) &&
32535: + canonicalPath !== canonicalRoot
32536: + ) {
32537: + return null;
32538: + }
32539: + let handle;
32540: + try {
32541: + handle = await open(canonicalPath, "r");
32542: + const fileStat = await handle.stat();
32543: + if (!fileStat.isFile()) {
32544: + await handle.close();
32545: + return null;
32546: + }
32547: + return { handle, fileStat, canonicalPath };
32548: + } catch (error) {
32549: + if (handle) await handle.close().catch(() => {});
32550: + if (isMissing(error)) return null;
32551: + throw error;
32552: + }
32553: +}
32554: +
32555: +async function serveFile(request, response, path, handle, fileStat) {
32556: + try {
32557: + response.statusCode = 200;
32558: + response.setHeader(
32559: + "Content-Type",
32560: + CONTENT_TYPES.get(extname(path).toLowerCase()) ??
32561: + "application/octet-stream",
32562: + );
32563: + response.setHeader("Content-Length", String(fileStat.size));
32564: + if (request.method === "HEAD") {
32565: + response.end();
32566: + return;
32567: + }
32568: +
32569: + try {
32570: + await pipeline(handle.createReadStream(), response);
32571: + } catch (error) {
32572: + if (isClientAbort(error, request, response)) return;
32573: + if (response.headersSent) {
32574: + response.destroy(error instanceof Error ? error : undefined);
32575: + return;
32576: + }
32577: + throw error;
32578: + }
32579: + } finally {
32580: + await handle.close().catch(() => {});
32581: + }
32582: +}
32583: +
32584: +async function handleRequest(rootDirectory, request, response) {
32585: + for (const [name, value] of Object.entries(CROSS_ORIGIN_ISOLATION_HEADERS)) {
32586: + response.setHeader(name, value);
32587: + }
32588: + if (request.method !== "GET" && request.method !== "HEAD") {
32589: + response.statusCode = 405;
32590: + response.setHeader("Allow", "GET, HEAD");
32591: + endResponse(request, response, "Method Not Allowed\n");
32592: + return;
32593: + }
32594: +
32595: + let requestUrl;
32596: + try {
32597: + requestUrl = new URL(request.url ?? "/", "http://localhost");
32598: + } catch {
32599: + response.statusCode = 400;
32600: + endResponse(request, response, "Bad Request\n");
32601: + return;
32602: + }
32603: + const pathname =
32604: + requestUrl.pathname === "/" ? "/index.html" : requestUrl.pathname;
32605: + const requestedPath = resolveStaticPath(rootDirectory, pathname);
32606: + if (requestedPath === null) {
32607: + response.statusCode = 400;
32608: + endResponse(request, response, "Bad Request\n");
32609: + return;
32610: + }
32611: +
32612: + let canonicalRoot;
32613: + try {
32614: + canonicalRoot = await realpath(rootDirectory);
32615: + } catch (error) {
32616: + response.statusCode = 500;
32617: + endResponse(request, response, "Internal Server Error\n");
32618: + return;
32619: + }
32620: +
32621: + const requestedSafe = await safeRegularFile(canonicalRoot, requestedPath);
32622: + if (requestedSafe !== null) {
32623: + await serveFile(
32624: + request,
32625: + response,
32626: + requestedPath,
32627: + requestedSafe.handle,
32628: + requestedSafe.fileStat,
32629: + );
32630: + return;
32631: + }
32632: +
32633: + const accept = request.headers.accept ?? "";
32634: + const ext = extname(pathname).toLowerCase();
32635: + if (!accept.includes("text/html") || (ext !== "" && ext !== ".html")) {
32636: + response.statusCode = 404;
32637: + endResponse(request, response, "Not Found\n");
32638: + return;
32639: + }
32640: +
32641: + const fallbackPath = resolve(rootDirectory, "index.html");
32642: + const fallbackSafe = await safeRegularFile(canonicalRoot, fallbackPath);
32643: + if (fallbackSafe === null) {
32644: + response.statusCode = 404;
32645: + endResponse(request, response, "Not Found\n");
32646: + return;
32647: + }
32648: + await serveFile(
32649: + request,
32650: + response,
32651: + fallbackPath,
32652: + fallbackSafe.handle,
32653: + fallbackSafe.fileStat,
32654: + );
32655: +}
32656: +
32657: +export function createBrowserStaticServer(rootDirectory = DEFAULT_ROOT) {
32658: + const root = resolve(rootDirectory);
32659: + return createServer((request, response) => {
32660: + void handleRequest(root, request, response).catch((error) => {
32661: + if (isClientAbort(error, request, response)) return;
32662: + console.error("Browser static server request failed", error);
32663: + if (response.headersSent) {
32664: + response.destroy(error instanceof Error ? error : undefined);
32665: + return;
32666: + }
32667: + response.removeHeader("Content-Length");
32668: + response.removeHeader("Content-Type");
32669: + response.statusCode = 500;
32670: + response.setHeader("Content-Type", "text/plain; charset=utf-8");
32671: + const body = "Internal Server Error\n";
32672: + response.setHeader("Content-Length", String(body.length));
32673: + endResponse(request, response, body);
32674: + });
32675: + });
32676: +}
32677: +
32678: +export async function startBrowserStaticServer({
32679: + rootDirectory = DEFAULT_ROOT,
32680: + hostname = "127.0.0.1",
32681: + port = 4173,
32682: +} = {}) {
32683: + const server = createBrowserStaticServer(rootDirectory);
32684: + await new Promise((resolvePromise, reject) => {
32685: + const onError = (error) => reject(error);
32686: + server.once("error", onError);
32687: + server.listen(port, hostname, () => {
32688: + server.off("error", onError);
32689: + resolvePromise();
32690: + });
32691: + });
32692: + return server;
32693: +}
32694: +
32695: +export async function closeBrowserStaticServer(server) {
32696: + if (!server?.listening) return;
32697: + await new Promise((resolvePromise, reject) => {
32698: + server.close((error) => {
32699: + if (error) reject(error);
32700: + else resolvePromise();
32701: + });
32702: + server.closeAllConnections?.();
32703: + });
32704: +}
32705: +
32706: +if (import.meta.main) {
32707: + const port = Number(process.env.PORT ?? "4173");
32708: + if (!Number.isSafeInteger(port) || port < 1 || port > 65_535) {