@things-factory/figure-ui 10.1.110 → 10.1.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.110",
+  "version": "10.1.112",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -27,7 +27,7 @@
     "clean": "npm run clean:server && npm run clean:client"
   },
   "dependencies": {
-    "@hatiolab/figure-model": "^0.2.8",
+    "@hatiolab/figure-model": "^0.2.10",
     "@hatiolab/things-scene": "^10.1.65",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
@@ -40,9 +40,9 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@operato/utils": "^10.0.0",
-    "@things-factory/ai-assistant": "^10.1.110",
-    "@things-factory/figure-service": "^10.1.110",
+    "@things-factory/ai-assistant": "^10.1.112",
+    "@things-factory/figure-service": "^10.1.112",
     "three": "^0.185.1"
   },
-  "gitHead": "b68feb6eccbef44af2a6365f384bd852dd70a8f9"
+  "gitHead": "e300d1b60b98ccb80380afe8df6d2807b1bcff91"
 }

package/test/save-landed.test.ts

@@ -10,8 +10,11 @@ import { fileURLToPath } from 'node:url'
 import { addFigureBox, createFigureAsset, serializeFigureAsset } from '@hatiolab/figure-model'
 
 import { createFigureProductSession } from '../client/modeller/product-session.js'
+import { thumbnailHashOf } from '../client/modeller/thumbnail-hash.js'
 
 const read = (path: string) => readFileSync(fileURLToPath(new URL(path, import.meta.url)), 'utf8')
+/** A picture as the modeller sends one: a data URL. */
+const pic = (word: string) => `data:image/webp;base64,${Buffer.from(word).toString('base64')}`
 const unreachable = () => Object.assign(Error('서버에 연결하지 못했습니다.'), { code: 'SAVE_UNREACHABLE' })
 
 /** A server that keeps one row; its save can be made to fail before or after it writes. */
@@ -23,7 +26,8 @@ function server() {
     load: async (id: string) => ({ id, source: row }),
     readBack: async (id: string) => {
       if (state.loadFails) throw unreachable()
-      return { id, source: row, thumbnail: picture }
+      /* The server hands back the name it keeps the picture under, never the bytes. */
+      return { id, source: row, thumbnailHash: picture === undefined ? undefined : await thumbnailHashOf(picture) }
     },
     save: async (q: { id?: string; source: string; expectedSource?: string; thumbnail?: string }) => {
       if (state.hold) await state.hold
@@ -131,9 +135,9 @@ test('a refusal on grounds is not a save, even if the row holds the same text; a
   await other.open('a')
   other.command({ kind: 'rename', name: 'B' } as never)
   s2.setRow(serializeFigureAsset(JSON.parse(other.source())))
-  s2.setPicture('old-picture')
+  s2.setPicture(pic('old-picture'))
   s2.state.failBeforeWrite = true
-  await assert.rejects(other.save({ thumbnail: 'new-picture' }), (e: { code?: string }) => e.code === 'SAVE_UNREACHABLE')
+  await assert.rejects(other.save({ thumbnail: pic('new-picture') }), (e: { code?: string }) => e.code === 'SAVE_UNREACHABLE')
   assert.equal(other.read().dirty, true)
 })
 
@@ -187,12 +191,24 @@ test('the sent content confirmed on the server means every field of it, the pict
   session.command({ kind: 'rename', name: 'B' } as never)
   s.state.failAfterWrite = true
   s.state.loadFails = true
-  await assert.rejects(session.save({ thumbnail: 'mine' }), (e: { code?: string }) => e.code === 'SAVE_UNREACHABLE')
+  await assert.rejects(session.save({ thumbnail: pic('mine') }), (e: { code?: string }) => e.code === 'SAVE_UNREACHABLE')
   s.state.failAfterWrite = false
   s.state.loadFails = false
   /* Someone else changed the picture since: the source matches what was sent, the picture does not. */
-  s.setPicture('theirs')
+  s.setPicture(pic('theirs'))
   session.command({ kind: 'rename', name: 'C' } as never)
-  await assert.rejects(session.save({ thumbnail: 'mine-2' }), /다른 편집에서/)
+  await assert.rejects(session.save({ thumbnail: pic('mine-2') }), /다른 편집에서/)
   assert.equal(session.read().dirty, true)
 })
+
+/* ADR-0104 decision 6: the server keeps the picture by the hash of its bytes; read back, the sent picture is matched by it. */
+test('the answer lost after the picture was written: read back by its hash, it was saved', async () => {
+  const s = server()
+  const session = createFigureProductSession(s.store)
+  await session.open('a')
+  session.command({ kind: 'rename', name: 'B' } as never)
+  s.state.failAfterWrite = true
+  await session.save({ thumbnail: pic('card') })
+  assert.equal(session.read().dirty, false, 'source and picture both landed')
+  assert.equal(await thumbnailHashOf('not a picture'), undefined)
+})