@deepblend/dsh-blender-host 0.3.4 → 0.3.6

package/lib/creation-request.js

@@ -0,0 +1,64 @@
+/** Durable creation identity lives in the project record, under a store-scoped writer lease. */
+import { join } from 'node:path'
+import { BlenderError, BlenderErrorCode, CREATION_REQUEST_VERSION, sha256, sha256Canonical } from '@deepblend/dsh-blender-contracts'
+import { resolveInside } from './paths.js'
+import { withProjectWriter } from './project-writer.js'
+
+function jsonValue(value, ancestors = new Set()) {
+  if (value === null || ['string', 'boolean'].includes(typeof value)) return
+  if (typeof value === 'number' && Number.isFinite(value)) return
+  if (typeof value !== 'object' || ancestors.has(value)) throw new Error('Not a JSON value')
+  const prototype = Object.getPrototypeOf(value)
+  if (!Array.isArray(value) && prototype !== null && Object.getPrototypeOf(prototype) !== null) throw new Error('Not a JSON object')
+  ancestors.add(value)
+  for (const entry of Object.values(value)) jsonValue(entry, ancestors)
+  ancestors.delete(value)
+}
+
+export function creationIdentity(request) {
+  if (request.creationKey === undefined) return null
+  const key = request.creationKey
+  if (typeof key !== 'string' || !key.trim() || key.length > 128 || /[\x00-\x1f\x7f]/.test(key)) {
+    throw new BlenderError(BlenderErrorCode.CREATION_REQUEST_INVALID, 'creationKey must be non-empty text of at most 128 characters, without control characters.')
+  }
+  if (['staging', '.revision-writers', '.creation-requests'].includes(request.projectId)) {
+    throw new BlenderError(BlenderErrorCode.PROJECT_ID_INVALID, 'Choose a project id other than a reserved store directory.')
+  }
+  let requestHash
+  try {
+    const inputs = { title: request.title?.trim(), goal: request.goal ?? null,
+      recipe: request.recipe ?? null, sceneSpec: request.sceneSpec ?? null, projectId: request.projectId ?? null,
+      saveCheckpoint: request.saveCheckpoint !== false, renderPreview: request.renderPreview === true, actor: request.actor ?? null }
+    jsonValue(inputs)
+    requestHash = sha256Canonical(inputs)
+  } catch (cause) {
+    throw new BlenderError(BlenderErrorCode.CREATION_REQUEST_INVALID, 'Creation inputs must be JSON values.', { cause })
+  }
+  return { schemaVersion: CREATION_REQUEST_VERSION, keyHash: sha256(key.trim()), requestHash }
+}
+
+export async function withCreationRequest(store, request, create, recover) {
+  const identity = creationIdentity(request)
+  if (!identity) return create(null)
+  store.ensureRoot()
+  const scope = resolveInside(store.projectsRoot, join(store.projectsRoot, '.creation-requests', identity.keyHash), 'creation request lease')
+  // Hosts may use different workspace roots around the same store. The store
+  // itself determines this lease's location, so those Hosts still coordinate.
+  return withProjectWriter(scope, store.projectsRoot, async () => {
+    const matches = store.listProjectIds().map(projectId => ({ projectId, record: store.readRecord(projectId) }))
+      .filter(({ record }) => record.creationRequest?.keyHash === identity.keyHash)
+    if (matches.length > 1) throw new BlenderError(BlenderErrorCode.CREATION_REQUEST_CONFLICT, 'More than one project claims this creation request. Inspect the records before retrying.')
+    if (matches.length) {
+      const { projectId, record } = matches[0]
+      if (record.projectId !== projectId || record.creationRequest.schemaVersion !== identity.schemaVersion
+          || record.creationRequest.requestHash !== identity.requestHash) {
+        throw new BlenderError(BlenderErrorCode.CREATION_REQUEST_CONFLICT, 'This creationKey belongs to different creation inputs. Reuse the original inputs, or choose a new key for a new project.')
+      }
+      if (!(record.revisionCount > 0) || record.currentRevision === 'r0000') {
+        throw new BlenderError(BlenderErrorCode.CREATION_REQUEST_CONFLICT, 'The previous creation has no committed revision. Inspect that incomplete project before retrying; a second project was not created.', { detail: { projectId } })
+      }
+      return recover(projectId)
+    }
+    return create(identity)
+  })
+}

package/lib/index.js

@@ -34,6 +34,7 @@ import {
   LOG_SCOPE,
   BlenderError,
   BlenderErrorCode,
+  CREATION_REQUEST_VERSION,
   BlenderWarningCode,
   SCENE_PATCH_VERSION,
   buildViewPlan,
@@ -84,6 +85,7 @@ import {
 } from '@deepblend/dsh-blender-contracts'
 
 import { RecipeCatalog } from './recipe-catalog.js'
+import { withCreationRequest } from './creation-request.js'
 import { ProjectStore, GENESIS_REVISION, parseRevisionId } from './project-store.js'
 import { RenderJobStore, UNFINISHED_STATUSES } from './render-job-store.js'
 import { RevisionTransaction } from './revision-transaction.js'
@@ -599,6 +601,7 @@ export default class BlenderStudio extends Service {
    * @param {object} [request.sceneSpec] - a full SceneSpec to seed the project with.
    * @param {{ id: string, version: string, digest: string, parameters?: object }} [request.recipe]
    * @param {string} [request.projectId]
+   * @param {string} [request.creationKey] - a stable key reused only for the same creation intent.
    * @param {boolean} [request.saveCheckpoint]
    * @param {boolean} [request.renderPreview]
    * @param {AbortSignal} [request.signal]
@@ -612,8 +615,21 @@ export default class BlenderStudio extends Service {
       )
     }
     if (request.recipe && request.sceneSpec) throw new BlenderError('RECIPE_REQUEST_INVALID', 'Choose either a recipe or an initial scene')
+    return withCreationRequest(this.store, request, identity => this._createProject(request, identity),
+      projectId => this.store.withProjectWrite(projectId, async () => {
+        const project = await this.getProject(projectId)
+        const manifest = this.store.readRevisionManifest(projectId, project.currentRevision)
+        const job = manifest.jobId ? this.store.readJob(projectId, manifest.jobId) : null
+        return { ...project, revision: toCanonicalRevisionSummary({ manifest, checkpointPath: manifest.checkpoint }),
+          job: toCanonicalJobRecord(job), warnings: job?.warnings ?? [], creationReplayed: true }
+      }))
+  }
+
+  get creationRequestProtocol() { return CREATION_REQUEST_VERSION }
+
+  async _createProject(request, creationRequest) {
     const source = request.recipe ? this.recipes.instantiate(request.recipe) : null
-    const outcome = await this.transactions.createProject({ ...request,
+    const outcome = await this.transactions.createProject({ ...request, creationRequest,
       ...(source ? { sceneSpec: source.sceneSpec } : {}), recipeLock: source?.lock ?? null })
     return {
       ...toCanonicalProjectSummary({
@@ -3374,7 +3390,8 @@ export default class BlenderStudio extends Service {
         revisionCount: record.revisionCount ?? this.store.listRevisions(projectId).length,
         createdAt: record.createdAt ?? null,
         updatedAt: record.updatedAt ?? null,
-        unreadable: specs === null && record.currentRevision !== null,
+        creationPending: record.currentRevision === GENESIS_REVISION && record.revisionCount === 0,
+        unreadable: specs === null && record.currentRevision !== null && !(record.currentRevision === GENESIS_REVISION && record.revisionCount === 0),
         scene: specs,
         jobs: this.renderJobs.list(projectId).map(job => ({
           jobId: job.jobId,

package/lib/project-store.js

@@ -214,7 +214,9 @@ export class ProjectStore {
     const base = slugifyProjectId(title)
     for (let suffix = 0; suffix < 1000; suffix += 1) {
       const candidate = suffix === 0 ? base : `${base}-${suffix + 1}`
-      if (!this.exists(candidate)) return candidate
+      // The root staging directory is excluded from project listings. A title
+      // such as "Staging" must therefore allocate a suffixed, visible project.
+      if (candidate !== 'staging' && !this.exists(candidate)) return candidate
     }
     throw new BlenderError(
       BlenderErrorCode.PROJECT_EXISTS,

package/lib/revision-transaction.js

@@ -249,6 +249,7 @@ export class RevisionTransaction {
       revisionCount: 0,
       runtimeProtocolVersion: 'deepblend.blender/v1',
       projectsRoot: this.store.projectsRoot,
+      ...(input.creationRequest ? { creationRequest: input.creationRequest } : {}),
     })
 
     const outcome = await this._commit({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-host",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "type": "module",
   "description": "DeepBlend Host service: the blenderStudio business facade over the BlenderRuntime seam.",
   "main": "lib/index.js",
@@ -20,7 +20,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.3.4",
+    "@deepblend/dsh-blender-contracts": "0.3.6",
     "sharp": "0.35.5"
   },
   "license": "MIT",