@did-space/core 0.3.9 → 0.3.11

package/dist/meta/object.d.ts

@@ -8,17 +8,50 @@ export interface Object {
      * @memberof Object
      */
     key: string;
+    /**
+     * @description 文件名
+     * @example index.html
+     * @type {string}
+     * @memberof Object
+     */
     name: string;
+    /**
+     * @description
+     * @type {boolean}
+     * @memberof Object
+     */
     isDir: boolean;
+    /**
+     * @description 文件的大小
+     * @type {number}
+     * @memberof Object
+     */
     size: number;
+    /**
+     * @description
+     * @type {number}
+     * @memberof Object
+     */
     lastModified: number;
+    /**
+     * @description
+     * @type {boolean}
+     * @memberof Object
+     */
     editable: boolean;
     /**
      * @description 如果是一个文件夹，则为 null
+     * @example video/mp4
      * @type {string}
      * @memberof Object
      */
     mimeType: string;
+    /**
+     * @description
+     * @type {string}
+     * @memberof Object
+     */
+    absolutePath: string;
     /**
      * @description 对象的 hash 值(ipfs CID v1)
      * @type {string}

package/dist/space/global-space.js

@@ -64,21 +64,40 @@ class GlobalSpace {
                 raw: true,
             });
             debug('add.$objectRecord', JSON.stringify(objectRecord));
-            if (objectRecord) {
+            // @note: 运行时的纠错机制,我们发现 size 有时候保存出错(修复后将不可能出现),必须 hash 和 size 都相同,才不需要修改底层存储
+            if (objectRecord && objectRecord.size === options.size) {
                 return;
             }
             // 存储新对象到全局存储区
             const newKey = (0, utils_1.getHashPath)(options.hash);
             yield this.driver.writeAsOwner(newKey, data, options);
             // 添加 object 记录
-            yield this.objectRepository.create({
-                id: options.hash,
-                size: options.size,
-                meta: {
-                    mimeType: mime_types_1.default.lookup(key) || null,
-                    key,
-                },
-            });
+            if (objectRecord) {
+                // @note: 运行时的纠错机制, 我们发现 size 有时候保存出错(修复后将不可能出现),这个是一个兜底方案,但是这是一个稳健的做法
+                yield this.objectRepository.update({
+                    size: options.size,
+                    meta: {
+                        mimeType: mime_types_1.default.lookup(key) || null,
+                        key,
+                    },
+                }, {
+                    where: {
+                        id: options.hash,
+                    },
+                });
+            }
+            else {
+                yield this.objectRepository.create({
+                    id: options.hash,
+                    size: options.size,
+                    meta: {
+                        mimeType: mime_types_1.default.lookup(key) || null,
+                        key,
+                    },
+                }, {
+                    ignoreDuplicates: true,
+                });
+            }
             debug('add.after', JSON.stringify({ objectRecord }));
         });
     }

package/dist/space/object-space.js

@@ -221,6 +221,7 @@ class ObjectSpace {
                 include: this.objectRepository,
             });
             return Promise.all(trees.map((x) => __awaiter(this, void 0, void 0, function* () {
+                const absolutePath = (0, path_1.join)(x.spaceDid, x.key);
                 if (x.type === model_1.TreeModelType.FOLDER) {
                     const { size, lastModified } = yield this.getStatusAsOwner(x.key);
                     return {
@@ -231,6 +232,7 @@ class ObjectSpace {
                         lastModified: lastModified || new Date(x.updatedAt).getTime(),
                         editable: true,
                         mimeType: null,
+                        absolutePath,
                     };
                 }
                 return {
@@ -242,6 +244,7 @@ class ObjectSpace {
                     editable: true,
                     mimeType: x.Object.meta.mimeType,
                     hash: x.objectId,
+                    absolutePath,
                 };
             })));
         });
@@ -270,6 +273,7 @@ class ObjectSpace {
                     editable: true,
                     mimeType: x.Object.meta.mimeType,
                     hash: x.objectId,
+                    absolutePath: (0, path_1.join)(x.spaceDid, x.key),
                 };
             });
         });
@@ -324,9 +328,9 @@ class ObjectSpace {
                 isDir: x.type === model_1.TreeModelType.FOLDER,
                 size: x.type === model_1.TreeModelType.FOLDER ? 0 : x.Object.size,
                 lastModified: new Date(x.updatedAt).getTime(),
-                // FIXME: 需要后续处理一下
                 editable: true,
                 mimeType: x.type === model_1.TreeModelType.FOLDER ? null : x.Object.meta.mimeType,
+                absolutePath: (0, path_1.join)(x.spaceDid, x.key),
             };
         });
     }
@@ -343,10 +347,11 @@ class ObjectSpace {
             debug('_updateAsOwner.before', JSON.stringify({ key, options: (0, lodash_1.omit)(options, 'data'), where }));
             const oldTree = yield this.treeRepository.findOne({
                 where,
-                raw: true,
+                include: this.objectRepository,
             });
             debug('_updateAsOwner.$oldTree', JSON.stringify(oldTree));
-            if (oldTree.objectId === options.hash) {
+            // @note: 运行时的纠错机制,我们发现 size 有时候保存出错(修复后将不可能出现),必须 hash 和 size 都相同,才不需要修改底层存储
+            if (oldTree.objectId === options.hash && oldTree.Object.size === options.size) {
                 // 内容不变，不需要再次存储对象，只需要更新对象的事件即可
                 yield this.treeRepository.update({
                     updatedAt: new Date().toISOString(),
@@ -373,7 +378,7 @@ class ObjectSpace {
     }
     _createAsOwner(key, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            debug('_createAsOwner.before', JSON.stringify({ key, options }));
+            debug('_createAsOwner.before', JSON.stringify({ key, options: (0, lodash_1.omit)(options, 'data') }));
             const isDir = key.endsWith('/');
             if (isDir) {
                 // 添加 tree 记录

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/core",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "publishConfig": {
     "access": "public"
   },
@@ -36,7 +36,7 @@
     ]
   },
   "dependencies": {
-    "@arcblock/validator": "^1.18.91",
+    "@arcblock/validator": "^1.18.92",
     "debug": "^4.3.4",
     "hasha": "^5.2.2",
     "ipfs-only-hash": "^4.0.0",
@@ -60,5 +60,5 @@
     "ts-jest": "^28.0.6",
     "typescript": "^4.9.5"
   },
-  "gitHead": "82db55693ead83d0185ae410b0660a53f996a6e9"
+  "gitHead": "c6d855ee4ae889b24a3ba7575059f03c348353f9"
 }