@blocklet/sdk 1.15.17 → 1.16.0-beta-b16cb035

package/package.json

@@ -3,39 +3,72 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.15.17",
+  "version": "1.16.0-beta-b16cb035",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
   "files": [
     "lib",
     "service"
   ],
   "scripts": {
-    "lint": "eslint tests lib",
-    "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
-    "coverage": "npm run test -- --coverage"
+    "verify": "npm run lint:fix && npm run test && npm run build",
+    "lint": "eslint src tests service",
+    "lint:fix": "npm run lint -- --fix",
+    "test": "jest --forceExit --detectOpenHandles",
+    "coverage": "npm run test -- --coverage",
+    "clean": "rm -fr lib",
+    "prebuild": "npm run clean && npm run types",
+    "types": "rm -rf ./src/types && node tools/version.js && ts-node tools/types.js && rm -f ./src/types/index.ts && prettier --write ./src/types/notification.ts",
+    "build": "tsc",
+    "build:watch": "npm run build -- -w"
   },
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.15.17",
-    "@abtnode/constant": "1.15.17",
-    "@arcblock/did-auth": "^1.13.61",
-    "@arcblock/jwt": "^1.13.61",
-    "@blocklet/meta": "1.15.17",
-    "@nedb/core": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.61",
-    "@ocap/wallet": "^1.13.61",
-    "axios": "^0.21.4",
-    "fs-extra": "^10.0.0",
-    "joi": "^17.4.0",
+    "@abtnode/client": "1.16.0-beta-b16cb035",
+    "@abtnode/constant": "1.16.0-beta-b16cb035",
+    "@arcblock/did-auth": "1.18.59",
+    "@arcblock/jwt": "1.18.59",
+    "@arcblock/ws": "1.18.59",
+    "@blocklet/constant": "1.16.0-beta-b16cb035",
+    "@blocklet/meta": "1.16.0-beta-b16cb035",
+    "@did-connect/authenticator": "^2.1.44",
+    "@did-connect/handler": "^2.1.44",
+    "@nedb/core": "^2.1.5",
+    "@ocap/mcrypto": "1.18.59",
+    "@ocap/wallet": "1.18.59",
+    "axios": "^0.27.2",
+    "cheerio": "^1.0.0-rc.12",
+    "fs-extra": "^10.1.0",
+    "joi": "17.7.0",
+    "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "lru-cache": "^6.0.0",
+    "ufo": "^1.1.1",
     "url-join": "^4.0.1"
   },
+  "resolutions": {
+    "@nedb/core": "^2.1.2"
+  },
   "devDependencies": {
-    "detect-port": "^1.3.0",
-    "jest": "^27.3.1"
+    "@arcblock/eslint-config-ts": "^0.2.3",
+    "@types/express": "^4.17.14",
+    "@types/jest": "^29.2.0",
+    "@types/json-stable-stringify": "^1.0.34",
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^18.11.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
+    "@typescript-eslint/parser": "^5.40.1",
+    "detect-port": "^1.5.1",
+    "eslint": "^8.25.0",
+    "jest": "^29.2.0",
+    "joi-to-typescript": "^4.0.7",
+    "json-stable-stringify": "^1.0.1",
+    "prettier": "^2.7.1",
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4"
   },
-  "gitHead": "22715c3ea74d0230f3413162a17f491614b6735a"
+  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
 }

package/lib/database.js

@@ -1,98 +0,0 @@
-const path = require('path');
-const fs = require('fs-extra');
-const { PromisedDatastore } = require('@nedb/core');
-
-if (!process.env.BLOCKLET_DATA_DIR) {
-  throw new Error('valid BLOCKLET_DATA_DIR env is required');
-}
-
-const DB_DIR = path.join(process.env.BLOCKLET_DATA_DIR, 'db');
-fs.ensureDirSync(DB_DIR);
-
-/**
- * 判断查询的数据是否存在
- * 因为函数的定义是判断指定条件是否存在，所以需要直接返回结果，而不是返回一个 nedb 对象或 nedb cursor 对象
- * @returns Boolean
- */
-async function exists(...args) {
-  const tmp = await this.findOne(...args);
-  return !!tmp;
-}
-
-/**
- * 分页查询
- * 这里需要返回一个 nedb cursor 对象，因为后续可能还会链式操作别的方法，所以不能使用 await
- * @param {number} page 页码
- * @param {number} size 分页大小
- * @returns nedb cursor
- */
-function paginate(page, size) {
-  const tmp = this.skip(page * size - page).limit(size);
-  return tmp;
-}
-
-/**
- * 代理 nedb cursor，如果需要对查询条件做扩展，需要把方法添加到这里
- * @param {Nedb Cursor} cursor
- * @returns nedb cursor
- */
-function proxyCursor(cursor) {
-  return new Proxy(cursor, {
-    get(target, prop) {
-      if (prop === 'paginate') return paginate;
-
-      return target[prop];
-    },
-  });
-}
-
-/**
- * 代理 nedb 对象，如果需要在 nedb 上增加方法，需要把方法添加到这里
- * @param {Nedb} db nedb
- * @returns promise
- */
-function proxyNedb(db) {
-  return new Proxy(db, {
-    get(target, prop) {
-      const propFn = target[prop];
-      if (prop === 'exists') return exists;
-
-      if (PromisedDatastore.CURSOR_FN_LIST.includes(prop)) {
-        return function wrap(...args) {
-          const rawFn = propFn.bind(this)(...args);
-          return proxyCursor(rawFn);
-        };
-      }
-      return propFn;
-    },
-  });
-}
-
-module.exports = function Datastore(name, options = {}) {
-  if (!new.target) {
-    throw new Error("This function must called by 'new' command!");
-  }
-  const filename = options.filename || path.join(DB_DIR, `${name}.db`);
-  const db = new PromisedDatastore({
-    filename,
-    autoload: true,
-    timestampData: true,
-    onload: (err) => {
-      if (err) {
-        console.error(`failed to load disk database ${filename}`, err);
-      }
-    },
-    ...options,
-  });
-
-  const proxyDb = proxyNedb(db);
-
-  // 如果直接返回 proxyDb，则无法使用 class 的 extends 进行类的方法扩展
-  // 这个 proxy 首先会判断自身是否有这个方法，如果有，则直接返回；如果没有，则会去 proxyDb 中查找
-  return new Proxy(this, {
-    get(target, prop) {
-      if (target[prop]) return target[prop];
-      return proxyDb[prop];
-    },
-  });
-};