@did-space/core 0.3.21 → 0.3.22

package/dist/protocols/space-operator.d.ts

@@ -23,6 +23,7 @@ export interface GetHashOptions extends AppSpaceOptions {
 }
 export interface ListOptions {
     key: string;
+    useGlobal?: false | true;
 }
 export interface ListsOptions {
     key: string;
@@ -57,5 +58,5 @@ export interface SpaceOperatorProtocol extends SpaceOwnerOperatorProtocol {
     getHash(options: GetHashOptions): Promise<string>;
     exists(options: ReadOptions): Promise<boolean>;
     lists(options: ListsOptions): Promise<Object[]>;
-    list(options: ListOptions): Promise<Object>;
+    list(options: ListOptions): Promise<Object | null>;
 }

package/dist/space/global-space.js

@@ -64,8 +64,12 @@ class GlobalSpace {
                 raw: true,
             });
             debug('add.$objectRecord', JSON.stringify(objectRecord));
+            const listObject = yield this.driver.list({
+                key: (0, utils_1.getHashPath)(options.hash),
+                useGlobal: true,
+            });
             // @note: 运行时的纠错机制,我们发现 size 有时候保存出错(修复后将不可能出现),必须 hash 和 size 都相同,才不需要修改底层存储
-            if (objectRecord && objectRecord.size === options.size) {
+            if (objectRecord && objectRecord.size === options.size && (listObject === null || listObject === void 0 ? void 0 : listObject.size) === options.size) {
                 return;
             }
             // 存储新对象到全局存储区

package/dist/space/object-space.js

@@ -350,8 +350,14 @@ class ObjectSpace {
                 include: this.objectRepository,
             });
             debug('_updateAsOwner.$oldTree', JSON.stringify(oldTree));
+            const listObject = yield this.driver.list({
+                key: (0, utils_1.getHashPath)(options.hash),
+                useGlobal: true,
+            });
             // @note: 运行时的纠错机制,我们发现 size 有时候保存出错(修复后将不可能出现),必须 hash 和 size 都相同,才不需要修改底层存储
-            if (oldTree.objectId === options.hash && oldTree.Object.size === options.size) {
+            if (oldTree.objectId === options.hash &&
+                oldTree.Object.size === options.size &&
+                (listObject === null || listObject === void 0 ? void 0 : listObject.size) === options.size) {
                 // 内容不变，不需要再次存储对象，只需要更新对象的事件即可
                 yield this.treeRepository.update({
                     updatedAt: new Date().toISOString(),

package/dist/utils/common.d.ts

@@ -1,3 +1,4 @@
 import { Data } from '../meta';
 export declare function getSize(data: Data): number;
 export declare function isDirectory(key: string): boolean;
+export declare function isValidData(data: Data): boolean;

package/dist/utils/common.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDirectory = exports.getSize = void 0;
+exports.isValidData = exports.isDirectory = exports.getSize = void 0;
+const lodash_1 = require("lodash");
+const stream_1 = require("stream");
 function getSize(data) {
     if (typeof data === 'string') {
         return Buffer.byteLength(data, 'utf-8');
@@ -15,3 +17,13 @@ function isDirectory(key) {
     return key.endsWith('/');
 }
 exports.isDirectory = isDirectory;
+function isValidData(data) {
+    if ((0, lodash_1.isString)(data) || (0, lodash_1.isBuffer)(data)) {
+        return true;
+    }
+    if (data instanceof stream_1.Stream || data instanceof stream_1.Readable || (0, lodash_1.isFunction)(data === null || data === void 0 ? void 0 : data.pipe)) {
+        return true;
+    }
+    return false;
+}
+exports.isValidData = isValidData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/core",
-  "version": "0.3.21",
+  "version": "0.3.22",
   "publishConfig": {
     "access": "public"
   },
@@ -60,5 +60,5 @@
     "ts-jest": "^28.0.6",
     "typescript": "^4.9.5"
   },
-  "gitHead": "558719cb308f43ce1cc62c60125522726d8e1014"
+  "gitHead": "09a609e207a621b158581f3d3f8623e61ccbb90a"
 }