refactor(workspace): initialize the default workspace on startup
This commit is contained in:
1 parent
43372b28ce
commit
4d2e420ef8
64 files changed
+509
-832
No files matched your search
@@ -108,9 +108,11 @@ export class ClientWorkspaceModel implements WorkspaceFollowSink {
|
||||
* @param signal - caller lifetime.
|
||||
* @returns generated Remote result.
|
||||
*/
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<RemoteResult<WorkspaceValue>> {
|
||||
async initializeDefault(
|
||||
request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal,
|
||||
): Promise<RemoteResult<WorkspaceValue | undefined>> {
|
||||
const result = await this.remote.initializeDefault(request, signal)
|
||||
if (result.ok) this.upsert(result.value.workspace)
|
||||
if (result.ok && result.value !== undefined) this.upsert(result.value.workspace)
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
@@ -43,9 +43,9 @@ export interface IWorkspaces {
|
||||
* Initialize or reuse the default Workspace.
|
||||
* @param request - initial directory name and title.
|
||||
* @param signal - caller lifetime.
|
||||
* @returns the prepared Workspace; rejects when directory selection is required.
|
||||
* @returns the prepared Workspace, or undefined when first-use initialization is ineligible; rejects on preparation failure.
|
||||
*/
|
||||
initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<WorkspaceView>
|
||||
initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<WorkspaceView | undefined>
|
||||
/**
|
||||
* Rename a Workspace.
|
||||
* @param workspaceId - target Workspace.
|
||||
@@ -117,10 +117,10 @@ export class WorkspaceController extends Service implements IWorkspaces {
|
||||
return result.value.workspace
|
||||
}
|
||||
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<WorkspaceView> {
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal?: AbortSignal): Promise<WorkspaceView | undefined> {
|
||||
const result = await this.model.initializeDefault(request, signal)
|
||||
if (!result.ok) throw new WorkspaceCreateError(result.error)
|
||||
return result.value.workspace
|
||||
return result.value?.workspace
|
||||
}
|
||||
|
||||
async rename(workspaceId: WorkspaceId, title: string): Promise<WorkspaceView> {
|
||||
|
||||
@@ -86,13 +86,13 @@ export class WorkspaceController extends TypertRemoteService {
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize or reuse the default Workspace before the first user message.
|
||||
* Initialize or reuse the default Workspace during first-use startup.
|
||||
* @param request - initial directory name and title; never rename an existing default.
|
||||
* @param signal - caller lifetime; cancels native directory lookup.
|
||||
* @returns the durable Workspace without creating a Session or sending a message.
|
||||
* @returns the durable Workspace, or undefined when first-use initialization is ineligible; creates no Session or message.
|
||||
*/
|
||||
@Remote('initializeDefault')
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal: AbortSignal): Promise<WorkspaceValue> {
|
||||
async initializeDefault(request: WorkspaceInitializeDefaultRequest, signal: AbortSignal): Promise<WorkspaceValue | undefined> {
|
||||
const { directoryName, title } = request
|
||||
if (directoryName.trim() === '' || directoryName !== directoryName.trim()
|
||||
|| directoryName.endsWith('.') || /[/\\:\0]/.test(directoryName) || title.trim() === '') {
|
||||
@@ -105,10 +105,7 @@ export class WorkspaceController extends TypertRemoteService {
|
||||
)
|
||||
return { path, title }
|
||||
})
|
||||
if (workspace === undefined) {
|
||||
throw new RemoteError('gateway/bad-request', 'choose a directory to create a Workspace', {})
|
||||
}
|
||||
return { workspace: workspaceView(workspace) }
|
||||
return workspace === undefined ? undefined : { workspace: workspaceView(workspace) }
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user