@did-space/core 1.0.10 → 1.0.11

package/dist/cjs/model/space.d.ts

@@ -1,5 +1,6 @@
-import type { Model } from 'sequelize';
+import type { CreationOptional, Model } from 'sequelize';
 import type { LiteralUnion } from 'type-fest';
+import type { Permissions } from '../configuration';
 export declare class SpaceRepositoryClass extends Model<SpaceRepositoryClass, SpaceRepositoryClass> {
     id: string;
     drive: string;
@@ -17,5 +18,10 @@ export declare class SpaceRepositoryClass extends Model<SpaceRepositoryClass, Sp
     updateAt: Date | string;
     expireAt: Date;
     ownerDid: string;
+    props: CreationOptional<{
+        usedUnit?: number;
+        usedUnitUpdatedAt?: string;
+        permissions?: Permissions;
+    }>;
 }
 export type SpaceRepository = typeof SpaceRepositoryClass;

package/dist/cjs/protocols/space-config.d.ts

@@ -2,6 +2,7 @@ import { SpaceConfig } from '../configuration';
 export interface PermissionOptions {
     fromAppDid: string;
     toAppDid: string;
+    isFromStorage?: false | true;
 }
 export interface SpaceConfigProtocol {
     createConfig(spaceConfig: SpaceConfig): Promise<void>;

package/dist/cjs/space/global-space.js

@@ -111,11 +111,13 @@ class GlobalSpace {
                 objectId: hash,
             };
             debug('delete.$where', JSON.stringify(where));
-            const treeRefCount = yield this.treeRepository.count({
+            const treeRef = yield this.treeRepository.findOne({
                 where,
+                raw: true,
+                attributes: ['id'],
             });
-            debug('delete.$treeRefCount', treeRefCount);
-            if (treeRefCount) {
+            debug('delete.$treeRef', treeRef);
+            if (treeRef) {
                 yield this.objectCollectionRepository.destroy({ where: { id: hash } });
                 return;
             }

package/dist/cjs/space/object-space.d.ts

@@ -29,6 +29,7 @@ export declare class ObjectSpace extends EventEmitter implements SpaceProtocol {
     readonly globalSpace: GlobalSpace;
     readonly driver: DriverProtocol;
     static readonly READONLY_OBJECT_KEYS: string[];
+    readonly configPath = "/config.yml";
     constructor(options: ObjectSpaceOptions);
     createSpace(spaceConfig: SpaceConfig): Promise<void>;
     isSpaceCreated(): Promise<boolean>;
@@ -90,18 +91,16 @@ export declare class ObjectSpace extends EventEmitter implements SpaceProtocol {
     getStatusAsOwner(key: string): Promise<KeyStatus>;
     createConfig(spaceConfig: SpaceConfig): Promise<void>;
     destroyConfig(): Promise<void>;
-    set<T = any>(key: string, value: T): Promise<void>;
-    get<T = any>(key: string, defaultValue?: T): Promise<T>;
+    set<T = any>(key: string, value: T, { isFromStorage }?: {
+        isFromStorage: false | true;
+    }): Promise<void>;
+    get<T = any>(key: string, defaultValue?: T, { isFromStorage }?: {
+        isFromStorage: false | true;
+    }): Promise<T>;
     private getPermission;
     /**
      *
      * @see https://blog.csdn.net/a1173537204/article/details/89765932
-     * @private
-     * @param {PermissionOptions} { fromAppDid, toAppDid }
-     * @param {number} permission
-     * @param {boolean} status
-     * @return {*}  {Promise<void>}
-     * @memberof S3SpaceConfig
      */
     private setPermission;
     /**

package/dist/cjs/space/object-space.js

@@ -32,6 +32,7 @@ const debug = (0, debug_1.default)('@did-space/core:ObjectSpace');
 class ObjectSpace extends events_1.default {
     constructor(options) {
         super();
+        this.configPath = '/config.yml';
         const { error } = schemas_1.ObjectSpaceOptionsSchema.validate(options, {
             allowUnknown: true,
             stripUnknown: true,
@@ -600,8 +601,10 @@ class ObjectSpace extends events_1.default {
                 key,
             };
             debug('existsAsOwner.before', JSON.stringify({ where }));
-            const exists = Boolean(yield this.options.treeRepository.count({
+            const exists = Boolean(yield this.options.treeRepository.findOne({
                 where,
+                raw: true,
+                attributes: ['id'],
             }));
             debug('existsAsOwner.after', JSON.stringify({ exists }));
             return exists;
@@ -650,7 +653,7 @@ class ObjectSpace extends events_1.default {
             debug('createConfig.$data', data);
             debug('createConfig.$hash', hash);
             debug('createConfig.$size', size);
-            yield this.writeAsOwner('/config.yml', data, {
+            yield this.writeAsOwner(this.configPath, data, {
                 hash,
                 size,
                 useGlobal: true,
@@ -658,53 +661,72 @@ class ObjectSpace extends events_1.default {
         });
     }
     destroyConfig() {
-        return this.deleteAsOwner('/config.yml');
+        return this.deleteAsOwner(this.configPath);
     }
-    set(key, value) {
+    set(key, value, { isFromStorage = false } = { isFromStorage: false }) {
         return __awaiter(this, void 0, void 0, function* () {
-            debug('set.before', JSON.stringify({ key, value }));
-            const configData = yield this.readAsOwner('/config.yml');
-            const data = js_yaml_1.default.load(yield (0, utils_1.streamToString)(configData));
-            data[key] = value;
-            yield this.createConfig(data);
+            debug('set.before', JSON.stringify({ key, value, isFromStorage }));
+            let data;
+            if (isFromStorage) {
+                const configData = yield this.readAsOwner(this.configPath);
+                data = js_yaml_1.default.load(yield (0, utils_1.streamToString)(configData));
+                data[key] = value;
+                yield this.writeAsOwner(this.configPath, js_yaml_1.default.dump(data));
+            }
+            else {
+                yield this.options.spaceRepository.update({
+                    [key]: value,
+                }, {
+                    where: {
+                        did: this.options.spaceDid,
+                    },
+                });
+            }
         });
     }
-    get(key, defaultValue = {}) {
+    get(key, defaultValue = {}, { isFromStorage } = { isFromStorage: false }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             debug('get.before', JSON.stringify({ key }));
-            const configData = yield this.readAsOwner('/config.yml');
-            const data = js_yaml_1.default.load(yield (0, utils_1.streamToString)(configData));
+            let data;
+            if (isFromStorage) {
+                const configData = yield this.readAsOwner(this.configPath);
+                data = js_yaml_1.default.load(yield (0, utils_1.streamToString)(configData));
+            }
+            else {
+                data = yield this.options.spaceRepository.findOne({
+                    where: {
+                        did: this.options.spaceDid,
+                    },
+                });
+            }
             return (_a = data[key]) !== null && _a !== void 0 ? _a : defaultValue;
         });
     }
-    getPermission({ fromAppDid, toAppDid }) {
+    getPermission({ fromAppDid, toAppDid, isFromStorage = false }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const permissions = yield this.get('permissions');
+            const permissions = yield this.get('permissions', {}, { isFromStorage });
             return ((_a = permissions === null || permissions === void 0 ? void 0 : permissions[fromAppDid]) === null || _a === void 0 ? void 0 : _a[toAppDid]) || 0;
         });
     }
     /**
      *
      * @see https://blog.csdn.net/a1173537204/article/details/89765932
-     * @private
-     * @param {PermissionOptions} { fromAppDid, toAppDid }
-     * @param {number} permission
-     * @param {boolean} status
-     * @return {*}  {Promise<void>}
-     * @memberof S3SpaceConfig
      */
-    setPermission({ fromAppDid, toAppDid }, permission, status) {
+    setPermission({ fromAppDid, toAppDid, isFromStorage = false }, permission, status) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const permissions = yield this.get('permissions', {});
+            const permissions = yield this.get('permissions', {}, { isFromStorage });
             // 我想知道原来的权限是啥样的？
             const oldPermission = ((_a = permissions === null || permissions === void 0 ? void 0 : permissions[fromAppDid]) === null || _a === void 0 ? void 0 : _a[toAppDid]) || 0;
             permissions[fromAppDid] = Object.assign((_b = permissions === null || permissions === void 0 ? void 0 : permissions[fromAppDid]) !== null && _b !== void 0 ? _b : {}, Object.assign(Object.assign({}, permissions === null || permissions === void 0 ? void 0 : permissions[fromAppDid]), { 
                 // eslint-disable-next-line no-bitwise
                 [toAppDid]: status ? oldPermission | permission : oldPermission & ~permission }));
-            yield this.set('permissions', permissions);
+            yield Promise.all([
+                this.set('permissions', permissions),
+                this.set('permissions', permissions, { isFromStorage: true }),
+            ]);
         });
     }
     /**

package/dist/cjs/utils/hash.js

@@ -17,6 +17,7 @@ const path_1 = require("path");
 const ipfs_only_hash_1 = require("@arcblock/ipfs-only-hash");
 const multiformats_1 = require("multiformats");
 const hasha_1 = __importDefault(require("hasha"));
+const destroy_1 = __importDefault(require("destroy"));
 const common_1 = require("./common");
 /**
  *
@@ -52,16 +53,25 @@ exports.getHashByAlgorithm = getHashByAlgorithm;
 // eslint-disable-next-line require-await
 function getHash(data = '', algorithm = 'ipfs') {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!['ipfs', 'sha256'].includes(algorithm)) {
-            throw new Error(`#getHash() Invalid algorithm type: ${algorithm}`);
+        try {
+            if (!['ipfs', 'sha256'].includes(algorithm)) {
+                throw new Error(`#getHash() Invalid algorithm type: ${algorithm}`);
+            }
+            if (!(0, common_1.isValidData)(data)) {
+                throw new Error(`#getHash() Invalid data type: ${data}`);
+            }
+            if (algorithm === 'ipfs') {
+                return yield getHashByIpfs(data);
+            }
+            return yield getHashByAlgorithm(data, algorithm);
         }
-        if (!(0, common_1.isValidData)(data)) {
-            throw new Error(`#getHash() Invalid data type: ${data}`);
+        catch (error) {
+            console.error(error);
+            throw error;
         }
-        if (algorithm === 'ipfs') {
-            return getHashByIpfs(data);
+        finally {
+            (0, destroy_1.default)(data);
         }
-        return getHashByAlgorithm(data, algorithm);
     });
 }
 exports.getHash = getHash;

package/dist/es/model/space.d.ts

@@ -1,5 +1,6 @@
-import type { Model } from 'sequelize';
+import type { CreationOptional, Model } from 'sequelize';
 import type { LiteralUnion } from 'type-fest';
+import type { Permissions } from '../configuration';
 export declare class SpaceRepositoryClass extends Model<SpaceRepositoryClass, SpaceRepositoryClass> {
     id: string;
     drive: string;
@@ -17,5 +18,10 @@ export declare class SpaceRepositoryClass extends Model<SpaceRepositoryClass, Sp
     updateAt: Date | string;
     expireAt: Date;
     ownerDid: string;
+    props: CreationOptional<{
+        usedUnit?: number;
+        usedUnitUpdatedAt?: string;
+        permissions?: Permissions;
+    }>;
 }
 export type SpaceRepository = typeof SpaceRepositoryClass;

package/dist/es/protocols/space-config.d.ts

@@ -2,6 +2,7 @@ import { SpaceConfig } from '../configuration';
 export interface PermissionOptions {
     fromAppDid: string;
     toAppDid: string;
+    isFromStorage?: false | true;
 }
 export interface SpaceConfigProtocol {
     createConfig(spaceConfig: SpaceConfig): Promise<void>;

package/dist/es/space/global-space.js

@@ -100,11 +100,13 @@ export class GlobalSpace {
             objectId: hash,
         };
         debug('delete.$where', JSON.stringify(where));
-        const treeRefCount = await this.treeRepository.count({
+        const treeRef = await this.treeRepository.findOne({
             where,
+            raw: true,
+            attributes: ['id'],
         });
-        debug('delete.$treeRefCount', treeRefCount);
-        if (treeRefCount) {
+        debug('delete.$treeRef', treeRef);
+        if (treeRef) {
             await this.objectCollectionRepository.destroy({ where: { id: hash } });
             return;
         }

package/dist/es/space/object-space.d.ts

@@ -29,6 +29,7 @@ export declare class ObjectSpace extends EventEmitter implements SpaceProtocol {
     readonly globalSpace: GlobalSpace;
     readonly driver: DriverProtocol;
     static readonly READONLY_OBJECT_KEYS: string[];
+    readonly configPath = "/config.yml";
     constructor(options: ObjectSpaceOptions);
     createSpace(spaceConfig: SpaceConfig): Promise<void>;
     isSpaceCreated(): Promise<boolean>;
@@ -90,18 +91,16 @@ export declare class ObjectSpace extends EventEmitter implements SpaceProtocol {
     getStatusAsOwner(key: string): Promise<KeyStatus>;
     createConfig(spaceConfig: SpaceConfig): Promise<void>;
     destroyConfig(): Promise<void>;
-    set<T = any>(key: string, value: T): Promise<void>;
-    get<T = any>(key: string, defaultValue?: T): Promise<T>;
+    set<T = any>(key: string, value: T, { isFromStorage }?: {
+        isFromStorage: false | true;
+    }): Promise<void>;
+    get<T = any>(key: string, defaultValue?: T, { isFromStorage }?: {
+        isFromStorage: false | true;
+    }): Promise<T>;
     private getPermission;
     /**
      *
      * @see https://blog.csdn.net/a1173537204/article/details/89765932
-     * @private
-     * @param {PermissionOptions} { fromAppDid, toAppDid }
-     * @param {number} permission
-     * @param {boolean} status
-     * @return {*}  {Promise<void>}
-     * @memberof S3SpaceConfig
      */
     private setPermission;
     /**

package/dist/es/space/object-space.js

@@ -19,6 +19,7 @@ export class ObjectSpace extends EventEmitter {
     globalSpace;
     driver;
     static READONLY_OBJECT_KEYS = ['/config.yml'];
+    configPath = '/config.yml';
     constructor(options) {
         super();
         const { error } = ObjectSpaceOptionsSchema.validate(options, {
@@ -555,8 +556,10 @@ export class ObjectSpace extends EventEmitter {
             key,
         };
         debug('existsAsOwner.before', JSON.stringify({ where }));
-        const exists = Boolean(await this.options.treeRepository.count({
+        const exists = Boolean(await this.options.treeRepository.findOne({
             where,
+            raw: true,
+            attributes: ['id'],
         }));
         debug('existsAsOwner.after', JSON.stringify({ exists }));
         return exists;
@@ -601,44 +604,60 @@ export class ObjectSpace extends EventEmitter {
         debug('createConfig.$data', data);
         debug('createConfig.$hash', hash);
         debug('createConfig.$size', size);
-        await this.writeAsOwner('/config.yml', data, {
+        await this.writeAsOwner(this.configPath, data, {
             hash,
             size,
             useGlobal: true,
         });
     }
     destroyConfig() {
-        return this.deleteAsOwner('/config.yml');
-    }
-    async set(key, value) {
-        debug('set.before', JSON.stringify({ key, value }));
-        const configData = await this.readAsOwner('/config.yml');
-        const data = jsYaml.load(await streamToString(configData));
-        data[key] = value;
-        await this.createConfig(data);
+        return this.deleteAsOwner(this.configPath);
+    }
+    async set(key, value, { isFromStorage = false } = { isFromStorage: false }) {
+        debug('set.before', JSON.stringify({ key, value, isFromStorage }));
+        let data;
+        if (isFromStorage) {
+            const configData = await this.readAsOwner(this.configPath);
+            data = jsYaml.load(await streamToString(configData));
+            data[key] = value;
+            await this.writeAsOwner(this.configPath, jsYaml.dump(data));
+        }
+        else {
+            await this.options.spaceRepository.update({
+                [key]: value,
+            }, {
+                where: {
+                    did: this.options.spaceDid,
+                },
+            });
+        }
     }
-    async get(key, defaultValue = {}) {
+    async get(key, defaultValue = {}, { isFromStorage } = { isFromStorage: false }) {
         debug('get.before', JSON.stringify({ key }));
-        const configData = await this.readAsOwner('/config.yml');
-        const data = jsYaml.load(await streamToString(configData));
+        let data;
+        if (isFromStorage) {
+            const configData = await this.readAsOwner(this.configPath);
+            data = jsYaml.load(await streamToString(configData));
+        }
+        else {
+            data = await this.options.spaceRepository.findOne({
+                where: {
+                    did: this.options.spaceDid,
+                },
+            });
+        }
         return data[key] ?? defaultValue;
     }
-    async getPermission({ fromAppDid, toAppDid }) {
-        const permissions = await this.get('permissions');
+    async getPermission({ fromAppDid, toAppDid, isFromStorage = false }) {
+        const permissions = await this.get('permissions', {}, { isFromStorage });
         return permissions?.[fromAppDid]?.[toAppDid] || 0;
     }
     /**
      *
      * @see https://blog.csdn.net/a1173537204/article/details/89765932
-     * @private
-     * @param {PermissionOptions} { fromAppDid, toAppDid }
-     * @param {number} permission
-     * @param {boolean} status
-     * @return {*}  {Promise<void>}
-     * @memberof S3SpaceConfig
      */
-    async setPermission({ fromAppDid, toAppDid }, permission, status) {
-        const permissions = await this.get('permissions', {});
+    async setPermission({ fromAppDid, toAppDid, isFromStorage = false }, permission, status) {
+        const permissions = await this.get('permissions', {}, { isFromStorage });
         // 我想知道原来的权限是啥样的？
         const oldPermission = permissions?.[fromAppDid]?.[toAppDid] || 0;
         permissions[fromAppDid] = Object.assign(permissions?.[fromAppDid] ?? {}, {
@@ -646,7 +665,10 @@ export class ObjectSpace extends EventEmitter {
             // eslint-disable-next-line no-bitwise
             [toAppDid]: status ? oldPermission | permission : oldPermission & ~permission,
         });
-        await this.set('permissions', permissions);
+        await Promise.all([
+            this.set('permissions', permissions),
+            this.set('permissions', permissions, { isFromStorage: true }),
+        ]);
     }
     /**
      *

package/dist/es/utils/hash.js

@@ -2,6 +2,7 @@ import { join } from 'path';
 import { onlyHash } from '@arcblock/ipfs-only-hash';
 import { CID } from 'multiformats';
 import hasha from 'hasha';
+import destroy from 'destroy';
 import { isValidData } from './common';
 /**
  *
@@ -32,16 +33,25 @@ export function getHashByAlgorithm(data = '', algorithm = 'sha256') {
  */
 // eslint-disable-next-line require-await
 export async function getHash(data = '', algorithm = 'ipfs') {
-    if (!['ipfs', 'sha256'].includes(algorithm)) {
-        throw new Error(`#getHash() Invalid algorithm type: ${algorithm}`);
+    try {
+        if (!['ipfs', 'sha256'].includes(algorithm)) {
+            throw new Error(`#getHash() Invalid algorithm type: ${algorithm}`);
+        }
+        if (!isValidData(data)) {
+            throw new Error(`#getHash() Invalid data type: ${data}`);
+        }
+        if (algorithm === 'ipfs') {
+            return await getHashByIpfs(data);
+        }
+        return await getHashByAlgorithm(data, algorithm);
     }
-    if (!isValidData(data)) {
-        throw new Error(`#getHash() Invalid data type: ${data}`);
+    catch (error) {
+        console.error(error);
+        throw error;
     }
-    if (algorithm === 'ipfs') {
-        return getHashByIpfs(data);
+    finally {
+        destroy(data);
     }
-    return getHashByAlgorithm(data, algorithm);
 }
 /**
  * @description

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/core",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "publishConfig": {
     "access": "public"
   },
@@ -115,11 +115,12 @@
     "watch": "npm run build -- -w"
   },
   "dependencies": {
-    "@arcblock/did": "^1.19.6",
+    "@arcblock/did": "^1.19.9",
     "@arcblock/ipfs-only-hash": "^0.0.2",
-    "@arcblock/validator": "^1.19.6",
+    "@arcblock/validator": "^1.19.9",
     "dayjs": "^1.11.13",
     "debug": "^4.4.0",
+    "destroy": "^1.2.0",
     "hasha": "^5.2.2",
     "joi": "^17.13.3",
     "js-yaml": "^4.1.0",
@@ -134,6 +135,7 @@
   },
   "devDependencies": {
     "@arcblock/eslint-config-ts": "^0.3.3",
+    "@types/destroy": "^1.0.3",
     "@types/jest": "^28.1.8",
     "@types/node": "18.19.31",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
@@ -143,8 +145,8 @@
     "lint-staged": "^13.3.0",
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5",
-    "vite": "^5.4.11",
-    "vitest": "^3.0.2"
+    "vite": "^5.4.14",
+    "vitest": "^3.0.5"
   },
-  "gitHead": "bf1e53904f28b786d728648fe0a7d828478551de"
+  "gitHead": "a6ef4e989848b33ea26c84fe0d93109587143d34"
 }