mirror of
https://github.com/coder/code-server.git
synced 2024-11-25 18:46:00 +03:00
efce00582b
* chore: update Code to 1.72.2
* chore: refresh integration patch
* chore: refresh base-path
* chore: refresh proposed-api patch
* chore: refresh marketplace patch
* chore: refresh webview patch
* chore: refresh disable-builtin patch
* chore: refresh logout, update-check patches
* chor: refresh proxy-uri patch
* fix: delete unique-db patch
This was supposed to be removed in https://github.com/coder/code-server/pull/5519
Looks like I didn't update the series or actually delete the patch.
* fix: drop log-level patch
This was merged upstream!
* chore: refresh local-storage patch
* chore: refresh service-worker patch
* chore: refresh sourcemaps patch
* chore: refresh disable-downloads patch
* chore: refresh telemetry patch
* chore: refresh language patch
* chore: refresh cli-window-open patch
* Revert "fix: delete unique-db patch"
This reverts commit ca0506c5f6.
* fixup!: rm extra spaces integration patch
* fixup: space
* fixup! update unique-db patch
* fixup!: update hash in webview patch
* fixup! update marketplace patch
* fixup!: remove comma
37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
Prevent state collisions
|
|
|
|
Previously if you opened different workspaces that had the same filesystem path
|
|
(for example if you have /home/coder on two different machines that are both
|
|
accessed through the same host) they would conflict with each other. This
|
|
ensures that different browser paths will be unique (for example /workspace1 and
|
|
/workspace2).
|
|
|
|
The easiest way to test is to open files in the same workspace using both / and
|
|
/vscode and make sure they are not interacting with each other.
|
|
|
|
Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
|
|
+++ code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
|
|
@@ -17,6 +17,7 @@ import { AbstractStorageService, isProfi
|
|
import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
|
|
import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
|
|
import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
|
|
+import { hash } from 'vs/base/common/hash';
|
|
|
|
export class BrowserStorageService extends AbstractStorageService {
|
|
|
|
@@ -297,7 +298,11 @@ export class IndexedDBStorageDatabase ex
|
|
}
|
|
|
|
static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise<IIndexedDBStorageDatabase> {
|
|
- return IndexedDBStorageDatabase.create({ id: workspaceId }, logService);
|
|
+ // Add a unique ID based on the current path for per-workspace databases.
|
|
+ // This prevents workspaces on different machines that share the same domain
|
|
+ // and file path from colliding (since it does not appear IndexedDB can be
|
|
+ // scoped to a path) as long as they are hosted on different paths.
|
|
+ return IndexedDBStorageDatabase.create({ id: workspaceId + '-' + hash(location.pathname.toString().replace(/\/$/, "")).toString(16) }, logService);
|
|
}
|
|
|
|
static async create(options: IndexedDBStorageDatabaseOptions, logService: ILogService): Promise<IIndexedDBStorageDatabase> {
|