@did-space/core 0.5.31 → 0.5.33

package/dist/schemas/global-space.js

@@ -13,7 +13,8 @@ exports.GlobalSpaceOptionsSchema = validator_1.Joi.object({
 });
 exports.HashSchema = validator_1.Joi.string()
     .custom((value, helper) => {
-    if (!(0, utils_1.isCidV1)(value)) {
+    // @NOTE: 不是一个 ipfs cid，且不是一个 sha256 hash，才会报错
+    if (!(0, utils_1.isCidV1)(value) && value.length !== 64) {
         return helper.error(`Invalid hash(${value})`);
     }
     return value;

package/dist/space/object-space.js

@@ -27,7 +27,6 @@ const model_1 = require("../model");
 const utils_1 = require("../utils");
 const schemas_1 = require("../schemas");
 const constants_1 = require("../constants");
-const stream_1 = require("../utils/stream");
 const global_space_1 = require("./global-space");
 const debug = (0, debug_1.default)('@did-space/core:ObjectSpace');
 class ObjectSpace extends events_1.default {
@@ -336,7 +335,7 @@ class ObjectSpace extends events_1.default {
             if (error) {
                 throw error;
             }
-            if (!(0, utils_1.isDirectory)(key) && !(0, stream_1.isStream)(data)) {
+            if (!(0, utils_1.isDirectory)(key) && !(0, utils_1.isStream)(data)) {
                 options.hash = options.hash || (yield (0, utils_1.getHash)(data));
                 options.size = options.size || (0, utils_1.getSize)(data);
                 // @note: size 可能是空的
@@ -632,7 +631,7 @@ class ObjectSpace extends events_1.default {
         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, stream_1.streamToString)(configData));
+            const data = js_yaml_1.default.load(yield (0, utils_1.streamToString)(configData));
             data[key] = value;
             yield this.createConfig(data);
         });
@@ -642,7 +641,7 @@ class ObjectSpace extends events_1.default {
         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, stream_1.streamToString)(configData));
+            const data = js_yaml_1.default.load(yield (0, utils_1.streamToString)(configData));
             return (_a = data[key]) !== null && _a !== void 0 ? _a : defaultValue;
         });
     }

package/dist/utils/common.d.ts

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

package/dist/utils/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidData = exports.isDirectory = exports.getSize = void 0;
+exports.isValidData = exports.isStream = exports.isDirectory = exports.getSize = void 0;
 const lodash_1 = require("lodash");
 const stream_1 = require("stream");
 function getSize(data = '') {
@@ -17,13 +17,11 @@ function isDirectory(key) {
     return key.endsWith('/');
 }
 exports.isDirectory = isDirectory;
+function isStream(data) {
+    return data instanceof stream_1.Stream || data instanceof stream_1.Readable || (0, lodash_1.isFunction)(data === null || data === void 0 ? void 0 : data.pipe);
+}
+exports.isStream = isStream;
 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;
+    return (0, lodash_1.isString)(data) || (0, lodash_1.isBuffer)(data) || isStream(data);
 }
 exports.isValidData = isValidData;

package/dist/utils/hash.d.ts

@@ -1,4 +1,6 @@
+import type { LiteralUnion } from 'type-fest';
 import { Data } from '../meta';
+export type Algorithm = LiteralUnion<'ipfs' | 'sha256', string>;
 /**
  *
  * @see cid各个版本 https://docs.ipfs.tech/concepts/content-addressing/#cid-versions
@@ -9,7 +11,16 @@ import { Data } from '../meta';
  * @param {Data} data
  * @return {Promise<string>}  {Promise<string>}
  */
-export declare function getHash(data?: Data): Promise<string>;
+export declare function getHashByIpfs(data?: Data): Promise<string>;
+export declare function getHashByAlgorithm(data?: Data, algorithm?: Algorithm): Promise<string>;
+/**
+ *
+ *
+ * @export
+ * @param {Data} [data='']
+ * @param {AlgorithmName} [algorithm='ipfs']
+ */
+export declare function getHash(data?: Data, algorithm?: Algorithm): Promise<string>;
 /**
  * @description
  * @export

package/dist/utils/hash.js

@@ -8,12 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCidV1 = exports.getHashPath = exports.getHash = void 0;
+exports.isCidV1 = exports.getHashPath = exports.getHash = exports.getHashByAlgorithm = exports.getHashByIpfs = void 0;
 const path_1 = require("path");
 const ipfs_only_hash_1 = require("@arcblock/ipfs-only-hash");
 const multiformats_1 = require("multiformats");
-const stream_1 = require("./stream");
+const hasha_1 = __importDefault(require("hasha"));
+const common_1 = require("./common");
 /**
  *
  * @see cid各个版本 https://docs.ipfs.tech/concepts/content-addressing/#cid-versions
@@ -24,13 +28,40 @@ const stream_1 = require("./stream");
  * @param {Data} data
  * @return {Promise<string>}  {Promise<string>}
  */
-function getHash(data = '') {
+function getHashByIpfs(data = '') {
     return __awaiter(this, void 0, void 0, function* () {
-        if (typeof data === 'string' || Buffer.isBuffer(data) || (0, stream_1.isStream)(data)) {
-            const cidV0 = yield (0, ipfs_only_hash_1.onlyHash)(data);
-            return multiformats_1.CID.parse(cidV0).toV1().toString();
+        const cidV0 = yield (0, ipfs_only_hash_1.onlyHash)(data);
+        return multiformats_1.CID.parse(cidV0).toV1().toString();
+    });
+}
+exports.getHashByIpfs = getHashByIpfs;
+function getHashByAlgorithm(data = '', algorithm = 'sha256') {
+    if (typeof data === 'string' || Buffer.isBuffer(data)) {
+        return hasha_1.default.async(data, { algorithm });
+    }
+    return hasha_1.default.fromStream(data, { algorithm });
+}
+exports.getHashByAlgorithm = getHashByAlgorithm;
+/**
+ *
+ *
+ * @export
+ * @param {Data} [data='']
+ * @param {AlgorithmName} [algorithm='ipfs']
+ */
+// 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}`);
+        }
+        if (!(0, common_1.isValidData)(data)) {
+            throw new Error(`#getHash() Invalid data type: ${data}`);
+        }
+        if (algorithm === 'ipfs') {
+            return getHashByIpfs(data);
         }
-        throw new Error(`#getHash() Invalid data type: ${data}`);
+        return getHashByAlgorithm(data, algorithm);
     });
 }
 exports.getHash = getHash;

package/dist/utils/stream.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Readable } from 'stream';
-export declare function isStream(data: any): boolean;
 export declare function stringToStream(str: string): Readable;
 /**
  * @see https://stackoverflow.com/a/78087909

package/dist/utils/stream.js

@@ -9,14 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamToString = exports.stringToStream = exports.isStream = void 0;
+exports.streamToString = exports.stringToStream = void 0;
 const stream_1 = require("stream");
-const lodash_1 = require("lodash");
 const consumers_1 = require("node:stream/consumers");
-function isStream(data) {
-    return data instanceof stream_1.Stream || data instanceof stream_1.Readable || (0, lodash_1.isFunction)(data === null || data === void 0 ? void 0 : data.pipe);
-}
-exports.isStream = isStream;
 function stringToStream(str) {
     const stream = new stream_1.Readable();
     stream.push(str);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/core",
-  "version": "0.5.31",
+  "version": "0.5.33",
   "publishConfig": {
     "access": "public"
   },
@@ -53,5 +53,5 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5"
   },
-  "gitHead": "34b6e844b3128e1958cffe80c9bc6d71269e362b"
+  "gitHead": "f5350d2c846415b1a0dcbff82f9f9176ea49bf6f"
 }