@blocklet/meta 1.8.34 → 1.8.36

package/lib/validate.d.ts

@@ -0,0 +1,10 @@
+import { TBlockletMeta } from './types';
+declare const fixAndValidateService: (meta: TBlockletMeta) => TBlockletMeta;
+declare const validateMeta: (meta: any, { ensureMain, ensureFiles, ensureDist, schemaOptions, }?: {
+    ensureMain?: boolean;
+    ensureFiles?: boolean;
+    ensureDist?: boolean;
+    schemaOptions?: any;
+}) => TBlockletMeta;
+export default validateMeta;
+export { validateMeta, fixAndValidateService };

package/lib/validate.js

@@ -1,38 +1,32 @@
-const { createBlockletSchema } = require('./schema');
-const { getServiceConfig } = require('./service');
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixAndValidateService = exports.validateMeta = void 0;
+const schema_1 = require("./schema");
+const service_1 = require("./service");
 const fixAndValidateService = (meta) => {
-  if (!meta.interfaces) {
-    return meta;
-  }
-  if (!meta.interfaces.length) {
-    return meta;
-  }
-
-  meta.interfaces.forEach((d) => {
-    if (d.services && d.services.length) {
-      d.services.forEach((s) => {
-        s.config = getServiceConfig(s.name, s.config, { validate: true });
-      });
+    if (!meta.interfaces) {
+        return meta;
+    }
+    if (!meta.interfaces.length) {
+        return meta;
     }
-  });
-
-  return meta;
+    meta.interfaces.forEach((d) => {
+        if (d.services && d.services.length) {
+            d.services.forEach((s) => {
+                s.config = (0, service_1.getServiceConfig)(s.name, s.config, { validate: true });
+            });
+        }
+    });
+    return meta;
 };
-
-const validateMeta = (
-  meta,
-  { ensureMain = false, ensureFiles = false, ensureDist = false, schemaOptions = {} } = {}
-) => {
-  const schema = createBlockletSchema(null, { ensureMain, ensureFiles, ensureDist, ...schemaOptions });
-  const { value, error } = schema.validate(meta);
-  if (error) {
-    throw new Error(`Invalid blocklet meta: ${error.details.map((x) => x.message).join(', ')}`);
-  }
-
-  return value;
+exports.fixAndValidateService = fixAndValidateService;
+const validateMeta = (meta, { ensureMain = false, ensureFiles = false, ensureDist = false, schemaOptions = {}, } = {}) => {
+    const schema = (0, schema_1.createBlockletSchema)(null, Object.assign({ ensureMain, ensureFiles, ensureDist }, schemaOptions));
+    const { value, error } = schema.validate(meta);
+    if (error) {
+        throw new Error(`Invalid blocklet meta: ${error.details.map((x) => x.message).join(', ')}`);
+    }
+    return value;
 };
-
-module.exports = validateMeta;
-module.exports.validateMeta = validateMeta;
-module.exports.fixAndValidateService = fixAndValidateService;
+exports.validateMeta = validateMeta;
+exports.default = validateMeta;

package/lib/verify-multi-sig.d.ts

@@ -0,0 +1,3 @@
+import { TBlockletMeta } from './types';
+declare const verifyMultiSig: (blockletMeta: TBlockletMeta) => boolean;
+export = verifyMultiSig;

package/lib/verify-multi-sig.js

@@ -1,108 +1,101 @@
-const get = require('lodash/get');
-const omit = require('lodash/omit');
-const cloneDeep = require('lodash/cloneDeep');
-const stableStringify = require('json-stable-stringify');
-const { toTypeInfo } = require('@arcblock/did');
-const { fromPublicKey } = require('@ocap/wallet');
-const { verify } = require('@arcblock/jwt');
-const { fromBase64 } = require('@ocap/util');
-
-const debug = require('debug')('@blocklet/meta:verifyMultiSig');
-
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+/* eslint-disable @typescript-eslint/indent */
+const get_1 = __importDefault(require("lodash/get"));
+const omit_1 = __importDefault(require("lodash/omit"));
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
+const did_1 = require("@arcblock/did");
+const wallet_1 = require("@ocap/wallet");
+const jwt_1 = require("@arcblock/jwt");
+const util_1 = require("@ocap/util");
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)('@blocklet/meta:verifyMultiSig');
 function verifyDelegationToken(signature) {
-  if (signature.delegation) {
-    const payload = JSON.parse(fromBase64(signature.delegation.split('.')[1]));
-
-    if (payload.from !== signature.signer) {
-      debug('verify payload.from failed', { payload, signature });
-      return false;
-    }
-
-    if (payload.to !== signature.delegatee) {
-      debug('verify payload.to failed', { payload, signature });
-      return false;
-    }
-
-    if (!get(payload, 'permissions', []).includes('publish_blocklet')) {
-      debug('verify payload.permissions failed', payload);
-      return false;
-    }
-
-    // 验证一下delegation token
-    if (!verify(signature.delegation, signature.pk)) {
-      debug('verify delegation token failed', signature);
-      return false;
+    if (signature.delegation) {
+        // @ts-ignore
+        const payload = JSON.parse((0, util_1.fromBase64)(signature.delegation.split('.')[1]));
+        if (payload.from !== signature.signer) {
+            debug('verify payload.from failed', { payload, signature });
+            return false;
+        }
+        if (payload.to !== signature.delegatee) {
+            debug('verify payload.to failed', { payload, signature });
+            return false;
+        }
+        if (!(0, get_1.default)(payload, 'permissions', []).includes('publish_blocklet')) {
+            debug('verify payload.permissions failed', payload);
+            return false;
+        }
+        // 验证一下delegation token
+        if (!(0, jwt_1.verify)(signature.delegation, signature.pk)) {
+            debug('verify delegation token failed', signature);
+            return false;
+        }
     }
-  }
-
-  return true;
+    return true;
 }
-
-module.exports = (blockletMeta) => {
-  const { signatures: tmpSignatures, ...meta } = blockletMeta;
-  const signatures = cloneDeep(tmpSignatures);
-
-  if (!Array.isArray(signatures)) {
-    throw new Error('Invalid signatures, signatures should be an array');
-  }
-
-  if (signatures.length === 0) {
-    throw new Error('Invalid signatures, found empty');
-  }
-
-  const { length } = signatures;
-  let lastSignature = null;
-
-  for (let i = 0; i < length; i++) {
-    const signature = signatures.shift();
-
-    // 验证delegation token
-    if (!verifyDelegationToken(signature)) {
-      return false;
-    }
-
-    const { sig, signer, pk } = signature.delegation
-      ? {
-          sig: signature.sig,
-          signer: signature.delegatee,
-          pk: signature.delegateePk,
-        }
-      : signature;
-    delete signature.sig;
-    debug('verify', { signer });
-
-    let toBeVerifiedMeta = { ...meta };
-
-    if (lastSignature && lastSignature.appended) {
-      debug('appended fields', { signer, appended: lastSignature.appended });
-
-      lastSignature.appended.forEach((field) => {
-        toBeVerifiedMeta = omit(toBeVerifiedMeta, field);
-      });
+const verifyMultiSig = (blockletMeta) => {
+    const { signatures: tmpSignatures } = blockletMeta, meta = __rest(blockletMeta, ["signatures"]);
+    const signatures = (0, cloneDeep_1.default)(tmpSignatures);
+    if (!Array.isArray(signatures)) {
+        throw new Error('Invalid signatures, signatures should be an array');
     }
-
-    if (signature.excludes && signature.excludes.length > 0) {
-      debug('excludes fields', { signer, excludes: signature.excludes });
-
-      signature.excludes.forEach((field) => {
-        toBeVerifiedMeta = omit(toBeVerifiedMeta, field);
-      });
+    if (signatures.length === 0) {
+        throw new Error('Invalid signatures, found empty');
     }
-
-    const type = toTypeInfo(signer);
-    const wallet = fromPublicKey(pk, type);
-    const verifyRes = wallet.verify(
-      stableStringify({ ...toBeVerifiedMeta, signatures: [signature, ...signatures] }),
-      sig
-    );
-    if (verifyRes !== true) {
-      debug('verify failed', { signer });
-
-      return verifyRes;
+    const { length } = signatures;
+    let lastSignature = null;
+    for (let i = 0; i < length; i++) {
+        const signature = signatures.shift();
+        // 验证delegation token
+        if (!verifyDelegationToken(signature)) {
+            return false;
+        }
+        const { sig, signer, pk } = signature.delegation
+            ? {
+                sig: signature.sig,
+                signer: signature.delegatee,
+                pk: signature.delegateePk,
+            }
+            : signature;
+        delete signature.sig;
+        debug('verify', { signer });
+        let toBeVerifiedMeta = Object.assign({}, meta);
+        if (lastSignature && lastSignature.appended) {
+            debug('appended fields', { signer, appended: lastSignature.appended });
+            lastSignature.appended.forEach((field) => {
+                toBeVerifiedMeta = (0, omit_1.default)(toBeVerifiedMeta, field);
+            });
+        }
+        if (signature.excludes && signature.excludes.length > 0) {
+            debug('excludes fields', { signer, excludes: signature.excludes });
+            signature.excludes.forEach((field) => {
+                toBeVerifiedMeta = (0, omit_1.default)(toBeVerifiedMeta, field);
+            });
+        }
+        const type = (0, did_1.toTypeInfo)(signer);
+        const wallet = (0, wallet_1.fromPublicKey)(pk, type);
+        const verifyRes = wallet.verify((0, json_stable_stringify_1.default)(Object.assign(Object.assign({}, toBeVerifiedMeta), { signatures: [signature, ...signatures] })), sig);
+        if (verifyRes !== true) {
+            debug('verify failed', { signer });
+            return verifyRes;
+        }
+        lastSignature = signature;
     }
-
-    lastSignature = signature;
-  }
-
-  return true;
+    return true;
 };
+module.exports = verifyMultiSig;

package/lib/wallet.d.ts

@@ -0,0 +1,9 @@
+import { WalletObject } from '@ocap/wallet';
+import { DIDType } from '@arcblock/did';
+/**
+ * Gen DID from blocklet did and nodeSk
+ *
+ * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
+ */
+declare const getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: DIDType, index?: number) => WalletObject;
+export = getBlockletWallet;

package/lib/wallet.js

@@ -1,35 +1,25 @@
-const { types } = require('@ocap/mcrypto');
-const { fromSecretKey } = require('@ocap/wallet');
-const { isValid } = require('@arcblock/did');
-const { fromAppDid } = require('@arcblock/did-ext');
-
+"use strict";
+const mcrypto_1 = require("@ocap/mcrypto");
+const wallet_1 = require("@ocap/wallet");
+const did_1 = require("@arcblock/did");
+const did_ext_1 = require("@arcblock/did-ext");
 /**
  * Gen DID from blocklet did and nodeSk
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
- *
- * @public
- * @static
- * @param {string} blockletDid - blocklet did
- * @param {string} nodeSk - node sk used to derive blocklet sk
- * @param {object} [type={}]
- * @param {number} [index=0]
- * @returns {object} Wallet instance
  */
-const getBlockletWallet = (blockletDid, nodeSk, type = { role: types.RoleType.ROLE_APPLICATION }, index = 0) => {
-  if (!isValid(blockletDid)) {
-    try {
-      return fromSecretKey(blockletDid, type);
-    } catch (err) {
-      throw new Error(`Cannot get blocklet wallet with invalid blocklet did or custom sk: ${err.message}`);
+const getBlockletWallet = (blockletDid, nodeSk, type = { role: mcrypto_1.types.RoleType.ROLE_APPLICATION }, index = 0) => {
+    if (!(0, did_1.isValid)(blockletDid)) {
+        try {
+            return (0, wallet_1.fromSecretKey)(blockletDid, type);
+        }
+        catch (err) {
+            throw new Error(`Cannot get blocklet wallet with invalid blocklet did or custom sk: ${err.message}`);
+        }
+    }
+    if (!nodeSk) {
+        throw new Error('Cannot get blocklet wallet with empty node sk');
     }
-  }
-
-  if (!nodeSk) {
-    throw new Error('Cannot get blocklet wallet with empty node sk');
-  }
-
-  return fromAppDid(blockletDid, nodeSk, type, index);
+    return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, type, index);
 };
-
 module.exports = getBlockletWallet;

package/package.json

@@ -3,32 +3,40 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.34",
+  "version": "1.8.36",
   "description": "Library to parse/validate/fix blocklet meta",
-  "main": "lib/index.js",
+  "main": "./lib/index.js",
+  "typings": "./lib/index.d.ts",
   "files": [
     "lib"
   ],
   "scripts": {
-    "lint": "eslint tests lib",
-    "lint:fix": "eslint --fix tests lib",
+    "verify": "npm run lint:fix && npm run coverage && npm run build",
+    "lint": "eslint src tests",
+    "lint:fix": "npm run lint -- --fix",
     "test": "node tools/jest.js",
-    "coverage": "npm run test -- --coverage"
+    "coverage": "npm run test -- --coverage",
+    "clean": "rm -fr lib",
+    "types": "ts-node tools/types.js && sed -i.bak 's/unknown/string/g' ./src/types/schema.ts && rm  ./src/types/schema.ts.bak && prettier --write ./src/types/*.ts",
+    "prebuild": "npm run clean && npm run types",
+    "build": "tsc"
   },
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.34",
-    "@abtnode/util": "1.8.34",
-    "@arcblock/did": "1.18.13",
-    "@arcblock/did-ext": "1.18.13",
-    "@arcblock/did-util": "1.18.13",
-    "@arcblock/jwt": "1.18.13",
-    "@blocklet/constant": "1.8.34",
-    "@ocap/asset": "1.18.13",
-    "@ocap/mcrypto": "1.18.13",
-    "@ocap/util": "1.18.13",
-    "@ocap/wallet": "1.18.13",
+    "@abtnode/client": "1.8.36",
+    "@abtnode/constant": "1.8.36",
+    "@abtnode/util": "1.8.36",
+    "@arcblock/did": "1.18.15",
+    "@arcblock/did-ext": "1.18.15",
+    "@arcblock/did-util": "1.18.15",
+    "@arcblock/jwt": "1.18.15",
+    "@blocklet/constant": "1.8.36",
+    "@ocap/asset": "1.18.15",
+    "@ocap/mcrypto": "1.18.15",
+    "@ocap/types": "1.18.15",
+    "@ocap/util": "1.18.15",
+    "@ocap/wallet": "1.18.15",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -44,16 +52,30 @@
     "promise.any": "^2.0.4",
     "slugify": "^1.6.5",
     "url-join": "^4.0.1",
+    "utility-types": "^3.10.0",
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
+    "@abtnode/client": "^1.8.34",
+    "@arcblock/eslint-config-ts": "^0.2.3",
+    "@types/express": "^4.17.14",
+    "@types/jest": "^29.2.2",
     "@types/joi": "^17.2.3",
+    "@types/js-yaml": "^4.0.5",
+    "@types/validate-npm-package-name": "^4.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
     "body-parser": "^1.20.1",
     "compression": "^1.7.4",
     "detect-port": "^1.5.1",
+    "eslint": "^8.27.0",
     "expand-tilde": "^2.0.2",
     "express": "^4.18.2",
-    "jest": "^27.5.1"
+    "jest": "^29.3.0",
+    "prettier": "^2.7.1",
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4"
   },
-  "gitHead": "c5fbb8e57493db62f212217cfde1980c82f00297"
+  "gitHead": "507e974ce88bad1aa002c593130b32982207f803"
 }