create-blocklet 0.2.8 → 0.2.12

package/common/.github/workflows/main.yml

@@ -22,15 +22,15 @@ jobs:
         run: yarn
 
       - name: Blocklet workflow
-        uses: blocklet/action-workflow@v1.1
+        uses: blocklet/action-workflow@v1
         with:
           skip-upload: false
           skip-deploy: false
           bundle-command: yarn bundle
-          store-endpoint: ${{ secrets.STORE_ENDPOINT_STAGING }}
-          store-access-token: ${{ secrets.STORE_ACCESS_TOKEN_STAGING }}
-          abtnode-endpoint: ${{ secrets.STAGING_NODE_ENDPOINT }}
-          access-key: ${{ secrets.STAGING_NODE_ACCESS_KEY }}
-          access-secret: ${{ secrets.STAGING_NODE_ACCESS_SECRET }}
+          store-endpoint: ${{ secrets.STORE_ENDPOINT_DEV }}
+          store-access-token: ${{ secrets.STORE_ACCESS_TOKEN_DEV }}
+          server-endpoint: ${{ secrets.STAGING_NODE_ENDPOINT }}
+          server-access-key: ${{ secrets.STAGING_NODE_ACCESS_KEY }}
+          server-access-secret: ${{ secrets.STAGING_NODE_ACCESS_SECRET }}
           slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

package/common/Makefile

@@ -3,7 +3,7 @@
 dep:
 	@echo "Install dependencies required for this repo..."
 	@npm install
-	@npm install -g @abtnode/cli
+	@npm install -g @blocklet/cli
 
 test:
 	@echo "Running test suites..."

package/index.js

@@ -12,12 +12,7 @@ import * as envfile from 'envfile';
 
 import { echoBrand, echoDocument } from './lib/arcblock.js';
 import { getAuthor } from './lib/npm.js';
-import {
-  checkAbtnodeInstalled,
-  checkAbtnodeRunning,
-  checkSatisfiedVersion,
-  getAbtnodeDirectory,
-} from './lib/abtnode.js';
+import { checkServerInstalled, checkServerRunning, checkSatisfiedVersion, getServerDirectory } from './lib/server.js';
 import { toBlockletDid, toDidIcon } from './lib/did.js';
 
 const argv = minimist(process.argv.slice(2));
@@ -199,43 +194,43 @@ async function init() {
   await echoBrand();
   await echoDocument();
 
-  console.log('Checking abtnode runtime environment...', '\n');
+  console.log('Checking blocklet server runtime environment...', '\n');
 
-  const isAbtnodeInstalled = checkAbtnodeInstalled();
+  const isServerInstalled = checkServerInstalled();
   const isSatisfiedVersion = checkSatisfiedVersion();
-  const isAbtnodeRunning = checkAbtnodeRunning();
+  const isServerRunning = checkServerRunning();
 
-  if (!isAbtnodeInstalled) {
-    // 未安装 abtnode
-    console.log(red('To run the blocklet, you need a running abtnode instance on local machine.'), '\n');
+  if (!isServerInstalled) {
+    // 未安装 blocklet server
+    console.log(red('To run the blocklet, you need a running blocklet server instance on local machine.'), '\n');
     console.log(`Checkout ${green('README.md')} for more usage instructions.`);
     console.log('Now you should run:', '\n');
-    console.log(cyan('npm install -g @abtnode/cli'));
-    console.log(cyan('abtnode start -a'));
+    console.log(cyan('npm install -g @blocklet/cli'));
+    console.log(cyan('blocklet server start -a'));
   } else if (!isSatisfiedVersion) {
-    // 已安装 abtnode，但版本不满足
-    console.log(red('Your abtnode version is outdate, please update it to the latest version.'));
+    // 已安装 blocklet server，但版本不满足
+    console.log(red('Your blocklet server version is outdate, please update it to the latest version.'));
     console.log('Now you should run:', '\n');
-    if (isAbtnodeRunning) {
-      // abtnode 已经启动
-      const abtnodePath = getAbtnodeDirectory();
-      console.log(cyan(`cd ${abtnodePath}`));
-      console.log(cyan('abtnode stop'));
-      console.log(cyan('npm install -g @abtnode/cli'));
-      console.log(cyan('abtnode start'));
+    if (isServerRunning) {
+      // blocklet server 已经启动
+      const serverPath = getServerDirectory();
+      console.log(cyan(`cd ${serverPath}`));
+      console.log(cyan('blocklet server stop'));
+      console.log(cyan('npm install -g @blocklet/cli'));
+      console.log(cyan('blocklet server start'));
       console.log(cyan(`cd ${cwd}`));
     } else {
-      // abtnode 未启动
-      // TODO: 如何获取未启动的 abtnode 实例目录？
-      console.log(cyan('npm install -g @abtnode/cli'));
-      console.log(cyan('abtnode start -a'));
+      // blocklet server 未启动
+      // TODO: 如何获取未启动的 blocklet server 实例目录？
+      console.log(cyan('npm install -g @blocklet/cli'));
+      console.log(cyan('blocklet server start -a'));
     }
-  } else if (!isAbtnodeRunning) {
-    // 已经安装 abtnode，且版本满足，并且 abtnode 未启动
-    console.log(red('You need to start your abtnode before develop this blocklet.'));
+  } else if (!isServerRunning) {
+    // 已经安装 blocklet server，且版本满足，并且 blocklet server 未启动
+    console.log(red('You need to start your blocklet server before develop this blocklet.'));
     console.log('Now you should run:', '\n');
-    // TODO: 如何获取未启动的 abtnode 实例目录？
-    console.log(cyan('abtnode start -a'));
+    // TODO: 如何获取未启动的 blocklet server 实例目录？
+    console.log(cyan('blocklet server start -a'));
   }
 
   console.log(`\n\nScaffolding project in ${root}...`);

package/lib/server.js

@@ -0,0 +1,41 @@
+import semver from 'semver';
+import { getOutput } from './index.js';
+
+export function checkServerInstalled() {
+  const output = getOutput('which blocklet');
+  return !!output;
+}
+
+export function getServerVersion() {
+  const output = getOutput('blocklet --version');
+  return output.trim();
+}
+
+export function getServerStatus() {
+  const output = getOutput('blocklet server status');
+  const [matchStr] = output.match(/Blocklet Server status:[\s\S]*?\n/g) || [];
+  if (!matchStr) {
+    return 'stop';
+  }
+  const status = matchStr.replace(/Blocklet Server status:\s*(\S+)\s*\S*\n*[\s\S]*/gm, '$1');
+  return status.toLowerCase();
+}
+export function checkServerRunning() {
+  const status = getServerStatus();
+  return status === 'running';
+}
+
+export function checkSatisfiedVersion() {
+  const output = getOutput('blocklet --version');
+  const version = output.trim();
+  return semver.satisfies(version, '>= 1.6.1');
+}
+
+export function getServerDirectory() {
+  const output = getOutput('blocklet server status');
+  const [matchStr] = output.match(/Blocklet Server Data Directory:[\s\S]*?\n/gm) || [];
+  if (!matchStr) return null;
+
+  const directory = matchStr.replace(/Blocklet Server Data Directory:[\s]*([\S]+)\/\.abtnode\n/gm, '$1');
+  return directory;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.2.8",
+  "version": "0.2.12",
   "exports": "./index.js",
   "type": "module",
   "repository": "git@github.com:blocklet/create-blocklet.git",
@@ -40,7 +40,7 @@
     "prompts": "^2.4.1",
     "rc": "^1.2.8",
     "semver": "^7.3.5",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.5",
     "terminal-link": "^3.0.0",
     "yaml": "^1.10.2"
   },

package/template-dapp/react/README.md

@@ -34,17 +34,17 @@ This blocklet is a dapp project, which means this is a full-stack application. I
 
 ## Development
 
-1. Make sure you have [@abtnode/cli](https://www.npmjs.com/package/@abtnode/cli) installed
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
 
-   Blocklet needs abtnode as a dependency. So you need to install it first.  
-   `npm install -g @abtnode/cli`  
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
 
-2. Init abtnode & start abtnode
+2. Init blocklet server & start blocklet server
 
-   Before starting an abtnode, you need to init abtnode.  
-   `abtnode init --mode=debug`  
-   `abtnode start`  
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
 
 3. Go to the project directory `cd [name]`
@@ -57,12 +57,12 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 
 ## Deploy
 
-- If you want to deploy this blocklet to local abtnode, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment).
+- If you want to deploy this blocklet to local blocklet server, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment).
   > Or you can simply use `npm run deploy` command.
-- If you want to deploy this blocklet to remote abtnode, you can use the command below.
+- If you want to deploy this blocklet to remote blocklet server, you can use the command below.
 
   ```shell
-  blocklet deploy .blocklet/bundle --endpoint {your abtnode url} --access-key {abtnode access key} --access-secret {abtnode access secret}
+  blocklet deploy .blocklet/bundle --endpoint {your blocklet server url} --access-key {blocklet server access key} --access-secret {blocklet server access secret}
   ```
 
   > Make sure the blocklet is bundled before deployment.
@@ -83,7 +83,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
   1. [https://store.blocklet.dev/](https://store.blocklet.dev/)
   2. [https://dev.store.blocklet.dev/](https://dev.store.blocklet.dev/)
   3. A blocklet store started by yourself.
-     > Make sure you have installed a `blocklet store` on your own abtnode. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
+     > Make sure you have installed a `blocklet store` on your own blocklet server. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
 
   ```shell
   blocklet config set store {store url}
@@ -145,7 +145,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-dapp/react/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-react
 title: Blocklet Template React
-description: An ABT Node blocklet
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - react
@@ -48,11 +48,6 @@ scripts:
   preStart: node server/hooks/pre-start.js
   dev: npm run start
 environments:
-  - name: CHAIN_ID
-    description: What's endpoint of the chain id?
-    required: true
-    default: 'beta'
-    secure: false
   - name: CHAIN_HOST
     description: What's endpoint of the chain?
     required: true

package/template-dapp/react/server/hooks/pre-start.js

@@ -1,18 +1,18 @@
+require('@blocklet/sdk/lib/error-handler');
 require('dotenv-flow').config();
 
 const Client = require('@ocap/client');
 
 const env = require('../libs/env');
-const { wallet } = require('../libs/auth');
 const logger = require('../libs/logger');
+const { wallet } = require('../libs/auth');
 const { name } = require('../../package.json');
 
-const client = new Client(env.chainHost);
-
 const ensureAccountDeclared = async () => {
-  // Check for application account, skip this if we are running as a child component
   if (env.isComponent) return;
+  if (!env.chainHost) return;
 
+  const client = new Client(env.chainHost);
   const { state } = await client.getAccountState({ address: wallet.toAddress() }, { ignoreFields: ['context'] });
   if (!state) {
     const hash = await client.declare({ moniker: name, wallet });

package/template-dapp/react/server/libs/auth.js

@@ -1,17 +1,13 @@
 const path = require('path');
 const AuthStorage = require('@arcblock/did-auth-storage-nedb');
+const getWallet = require('@blocklet/sdk/lib/wallet');
 const WalletAuthenticator = require('@blocklet/sdk/lib/wallet-authenticator');
-const WalletHandlers = require('@blocklet/sdk/lib/wallet-handler');
-const { types } = require('@ocap/mcrypto');
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
 const logger = require('./logger');
 
-const appSk = process.env.APP_SK || process.env.BLOCKLET_APP_SK;
-const wallet = fromSecretKey(appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
-
+const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
-
-const handlers = new WalletHandlers({
+const handlers = new WalletHandler({
   authenticator,
   tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({

package/template-dapp/react/server/libs/env.js

@@ -1,12 +1,6 @@
-const blockletRealDid = process.env.BLOCKLET_REAL_DID || '';
-const blockletDid = process.env.BLOCKLET_DID || '';
-const isComponent = blockletRealDid && blockletDid && blockletRealDid !== blockletDid;
+const env = require('@blocklet/sdk/lib/env');
 
 module.exports = {
-  chainId: process.env.CHAIN_ID || '',
+  ...env,
   chainHost: process.env.CHAIN_HOST || '',
-  appId: process.env.BLOCKLET_APP_ID || '',
-  appName: process.env.APP_NAME || process.env.BLOCKLET_APP_NAME || '',
-  appDescription: process.env.APP_DESCRIPTION || process.env.BLOCKLET_APP_DESCRIPTION || '',
-  isComponent,
 };

package/template-dapp/react/server/routes/index.js

@@ -1,6 +1,8 @@
+const middleware = require('@blocklet/sdk/lib/middlewares');
 const router = require('express').Router();
 const env = require('../libs/env');
 
 router.use('/env', (req, res) => res.json(env));
+router.use('/user', middleware.user(), (req, res) => res.json(req.user));
 
 module.exports = router;

package/template-dapp/vue/README.md

@@ -28,17 +28,17 @@ This blocklet is a static project, which means this is a frontend application. I
 
 ## Development
 
-1. Make sure you have [@abtnode/cli](https://www.npmjs.com/package/@abtnode/cli) installed
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
 
-   Blocklet needs abtnode as a dependency. So you need to install it first.  
-   `npm install -g @abtnode/cli`  
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
 
-2. Init abtnode & start abtnode
+2. Init blocklet server & start blocklet server
 
-   Before starting an abtnode, you need to init abtnode.  
-   `abtnode init --mode=debug`  
-   `abtnode start`  
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
 
 3. Go to the project directory `cd [name]`
@@ -51,12 +51,12 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 
 ## Deploy
 
-- If you want to deploy this blocklet to local abtnode, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
+- If you want to deploy this blocklet to local blocklet server, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
   > Or you can simply use `npm run deploy` command.
-- If you want to deploy this blocklet to remote abtnode, you can use the command below.
+- If you want to deploy this blocklet to remote blocklet server, you can use the command below.
 
   ```shell
-  blocklet deploy .blocklet/bundle --endpoint {your abtnode url} --access-key {abtnode access key} --access-secret {abtnode access secret}
+  blocklet deploy .blocklet/bundle --endpoint {your blocklet server url} --access-key {blocklet server access key} --access-secret {blocklet server access secret}
   ```
 
   > Make sure the blocklet is bundled before deployment.
@@ -77,7 +77,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
   1. [https://store.blocklet.dev/](https://store.blocklet.dev/)
   2. [https://dev.store.blocklet.dev/](https://dev.store.blocklet.dev/)
   3. A blocklet store started by yourself.
-     > Make sure you have installed a `blocklet store` on your own abtnode. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
+     > Make sure you have installed a `blocklet store` on your own blocklet server. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
 
   ```shell
   blocklet config set store {store url}
@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-dapp/vue/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue
 title: Blocklet Template Vue
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue
@@ -47,11 +47,6 @@ scripts:
   preStart: node server/hooks/pre-start.js
   dev: npm run start
 environments:
-  - name: CHAIN_ID
-    description: What's endpoint of the chain id?
-    required: true
-    default: 'beta'
-    secure: false
   - name: CHAIN_HOST
     description: What's endpoint of the chain?
     required: true

package/template-dapp/vue/server/hooks/pre-start.js

@@ -1,18 +1,18 @@
+require('@blocklet/sdk/lib/error-handler');
 require('dotenv-flow').config();
 
 const Client = require('@ocap/client');
 
 const env = require('../libs/env');
-const { wallet } = require('../libs/auth');
 const logger = require('../libs/logger');
+const { wallet } = require('../libs/auth');
 const { name } = require('../../package.json');
 
-const client = new Client(env.chainHost);
-
 const ensureAccountDeclared = async () => {
-  // Check for application account, skip this if we are running as a child component
   if (env.isComponent) return;
+  if (!env.chainHost) return;
 
+  const client = new Client(env.chainHost);
   const { state } = await client.getAccountState({ address: wallet.toAddress() }, { ignoreFields: ['context'] });
   if (!state) {
     const hash = await client.declare({ moniker: name, wallet });

package/template-dapp/vue/server/libs/auth.js

@@ -1,17 +1,13 @@
 const path = require('path');
 const AuthStorage = require('@arcblock/did-auth-storage-nedb');
+const getWallet = require('@blocklet/sdk/lib/wallet');
 const WalletAuthenticator = require('@blocklet/sdk/lib/wallet-authenticator');
-const WalletHandlers = require('@blocklet/sdk/lib/wallet-handler');
-const { types } = require('@ocap/mcrypto');
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
 const logger = require('./logger');
 
-const appSk = process.env.APP_SK || process.env.BLOCKLET_APP_SK;
-const wallet = fromSecretKey(appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
-
+const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
-
-const handlers = new WalletHandlers({
+const handlers = new WalletHandler({
   authenticator,
   tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({

package/template-dapp/vue/server/libs/env.js

@@ -1,12 +1,6 @@
-const blockletRealDid = process.env.BLOCKLET_REAL_DID || '';
-const blockletDid = process.env.BLOCKLET_DID || '';
-const isComponent = blockletRealDid && blockletDid && blockletRealDid !== blockletDid;
+const env = require('@blocklet/sdk/lib/env');
 
 module.exports = {
-  chainId: process.env.CHAIN_ID || '',
+  ...env,
   chainHost: process.env.CHAIN_HOST || '',
-  appId: process.env.BLOCKLET_APP_ID || '',
-  appName: process.env.APP_NAME || process.env.BLOCKLET_APP_NAME || '',
-  appDescription: process.env.APP_DESCRIPTION || process.env.BLOCKLET_APP_DESCRIPTION || '',
-  isComponent,
 };

package/template-dapp/vue/server/routes/index.js

@@ -1,6 +1,8 @@
+const middleware = require('@blocklet/sdk/lib/middlewares');
 const router = require('express').Router();
 const env = require('../libs/env');
 
 router.use('/env', (req, res) => res.json(env));
+router.use('/user', middleware.user(), (req, res) => res.json(req.user));
 
 module.exports = router;

package/template-dapp/vue2/README.md

@@ -28,17 +28,17 @@ This blocklet is a static project, which means this is a frontend application. I
 
 ## Development
 
-1. Make sure you have [@abtnode/cli](https://www.npmjs.com/package/@abtnode/cli) installed
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
 
-   Blocklet needs abtnode as a dependency. So you need to install it first.  
-   `npm install -g @abtnode/cli`  
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
 
-2. Init abtnode & start abtnode
+2. Init blocklet server & start blocklet server
 
-   Before starting an abtnode, you need to init abtnode.  
-   `abtnode init --mode=debug`  
-   `abtnode start`  
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
 
 3. Go to the project directory `cd [name]`
@@ -51,12 +51,12 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 
 ## Deploy
 
-- If you want to deploy this blocklet to local abtnode, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
+- If you want to deploy this blocklet to local blocklet server, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
   > Or you can simply use `npm run deploy` command.
-- If you want to deploy this blocklet to remote abtnode, you can use the command below.
+- If you want to deploy this blocklet to remote blocklet server, you can use the command below.
 
   ```shell
-  blocklet deploy .blocklet/bundle --endpoint {your abtnode url} --access-key {abtnode access key} --access-secret {abtnode access secret}
+  blocklet deploy .blocklet/bundle --endpoint {your blocklet server url} --access-key {blocklet server access key} --access-secret {blocklet server access secret}
   ```
 
   > Make sure the blocklet is bundled before deployment.
@@ -77,7 +77,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
   1. [https://store.blocklet.dev/](https://store.blocklet.dev/)
   2. [https://dev.store.blocklet.dev/](https://dev.store.blocklet.dev/)
   3. A blocklet store started by yourself.
-     > Make sure you have installed a `blocklet store` on your own abtnode. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
+     > Make sure you have installed a `blocklet store` on your own blocklet server. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
 
   ```shell
   blocklet config set store {store url}
@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-dapp/vue2/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue2
 title: Blocklet Template Vue2
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue
@@ -45,11 +45,6 @@ requirements:
 scripts:
   dev: npm run start
 environments:
-  - name: CHAIN_ID
-    description: What's endpoint of the chain id?
-    required: true
-    default: 'beta'
-    secure: false
   - name: CHAIN_HOST
     description: What's endpoint of the chain?
     required: true

package/template-dapp/vue2/server/hooks/pre-start.js

@@ -1,18 +1,18 @@
+require('@blocklet/sdk/lib/error-handler');
 require('dotenv-flow').config();
 
 const Client = require('@ocap/client');
 
 const env = require('../libs/env');
-const { wallet } = require('../libs/auth');
 const logger = require('../libs/logger');
+const { wallet } = require('../libs/auth');
 const { name } = require('../../package.json');
 
-const client = new Client(env.chainHost);
-
 const ensureAccountDeclared = async () => {
-  // Check for application account, skip this if we are running as a child component
   if (env.isComponent) return;
+  if (!env.chainHost) return;
 
+  const client = new Client(env.chainHost);
   const { state } = await client.getAccountState({ address: wallet.toAddress() }, { ignoreFields: ['context'] });
   if (!state) {
     const hash = await client.declare({ moniker: name, wallet });

package/template-dapp/vue2/server/libs/auth.js

@@ -1,17 +1,13 @@
 const path = require('path');
 const AuthStorage = require('@arcblock/did-auth-storage-nedb');
+const getWallet = require('@blocklet/sdk/lib/wallet');
 const WalletAuthenticator = require('@blocklet/sdk/lib/wallet-authenticator');
-const WalletHandlers = require('@blocklet/sdk/lib/wallet-handler');
-const { types } = require('@ocap/mcrypto');
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
 const logger = require('./logger');
 
-const appSk = process.env.APP_SK || process.env.BLOCKLET_APP_SK;
-const wallet = fromSecretKey(appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
-
+const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
-
-const handlers = new WalletHandlers({
+const handlers = new WalletHandler({
   authenticator,
   tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({

package/template-dapp/vue2/server/libs/env.js

@@ -1,12 +1,6 @@
-const blockletRealDid = process.env.BLOCKLET_REAL_DID || '';
-const blockletDid = process.env.BLOCKLET_DID || '';
-const isComponent = blockletRealDid && blockletDid && blockletRealDid !== blockletDid;
+const env = require('@blocklet/sdk/lib/env');
 
 module.exports = {
-  chainId: process.env.CHAIN_ID || '',
+  ...env,
   chainHost: process.env.CHAIN_HOST || '',
-  appId: process.env.BLOCKLET_APP_ID || '',
-  appName: process.env.APP_NAME || process.env.BLOCKLET_APP_NAME || '',
-  appDescription: process.env.APP_DESCRIPTION || process.env.BLOCKLET_APP_DESCRIPTION || '',
-  isComponent,
 };

package/template-dapp/vue2/server/routes/index.js

@@ -1,6 +1,8 @@
+const middleware = require('@blocklet/sdk/lib/middlewares');
 const router = require('express').Router();
 const env = require('../libs/env');
 
 router.use('/env', (req, res) => res.json(env));
+router.use('/user', middleware.user(), (req, res) => res.json(req.user));
 
 module.exports = router;

package/template-static/react/README.md

@@ -28,17 +28,17 @@ This blocklet is a static project, which means this is a frontend application. I
 
 ## Development
 
-1. Make sure you have [@abtnode/cli](https://www.npmjs.com/package/@abtnode/cli) installed
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
 
-   Blocklet needs abtnode as a dependency. So you need to install it first.  
-   `npm install -g @abtnode/cli`  
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
 
-2. Init abtnode & start abtnode
+2. Init blocklet server & start blocklet server
 
-   Before starting an abtnode, you need to init abtnode.  
-   `abtnode init --mode=debug`  
-   `abtnode start`  
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
 
 3. Go to the project directory `cd [name]`
@@ -51,12 +51,12 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 
 ## Deploy
 
-- If you want to deploy this blocklet to local abtnode, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
+- If you want to deploy this blocklet to local blocklet server, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
   > Or you can simply use `npm run deploy` command.
-- If you want to deploy this blocklet to remote abtnode, you can use the command below.
+- If you want to deploy this blocklet to remote blocklet server, you can use the command below.
 
   ```shell
-  blocklet deploy .blocklet/bundle --endpoint {your abtnode url} --access-key {abtnode access key} --access-secret {abtnode access secret}
+  blocklet deploy .blocklet/bundle --endpoint {your blocklet server url} --access-key {blocklet server access key} --access-secret {blocklet server access secret}
   ```
 
   > Make sure the blocklet is bundled before deployment.
@@ -77,7 +77,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
   1. [https://store.blocklet.dev/](https://store.blocklet.dev/)
   2. [https://dev.store.blocklet.dev/](https://dev.store.blocklet.dev/)
   3. A blocklet store started by yourself.
-     > Make sure you have installed a `blocklet store` on your own abtnode. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
+     > Make sure you have installed a `blocklet store` on your own blocklet server. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
 
   ```shell
   blocklet config set store {store url}
@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-static/react/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-react
 title: Blocklet Template React
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - react

package/template-static/vue/README.md

@@ -28,17 +28,17 @@ This blocklet is a static project, which means this is a frontend application. I
 
 ## Development
 
-1. Make sure you have [@abtnode/cli](https://www.npmjs.com/package/@abtnode/cli) installed
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
 
-   Blocklet needs abtnode as a dependency. So you need to install it first.  
-   `npm install -g @abtnode/cli`  
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
 
-2. Init abtnode & start abtnode
+2. Init blocklet server & start blocklet server
 
-   Before starting an abtnode, you need to init abtnode.  
-   `abtnode init --mode=debug`  
-   `abtnode start`  
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
 
 3. Go to the project directory `cd [name]`
@@ -51,12 +51,12 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 
 ## Deploy
 
-- If you want to deploy this blocklet to local abtnode, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
+- If you want to deploy this blocklet to local blocklet server, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
   > Or you can simply use `npm run deploy` command.
-- If you want to deploy this blocklet to remote abtnode, you can use the command below.
+- If you want to deploy this blocklet to remote blocklet server, you can use the command below.
 
   ```shell
-  blocklet deploy .blocklet/bundle --endpoint {your abtnode url} --access-key {abtnode access key} --access-secret {abtnode access secret}
+  blocklet deploy .blocklet/bundle --endpoint {your blocklet server url} --access-key {blocklet server access key} --access-secret {blocklet server access secret}
   ```
 
   > Make sure the blocklet is bundled before deployment.
@@ -77,7 +77,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
   1. [https://store.blocklet.dev/](https://store.blocklet.dev/)
   2. [https://dev.store.blocklet.dev/](https://dev.store.blocklet.dev/)
   3. A blocklet store started by yourself.
-     > Make sure you have installed a `blocklet store` on your own abtnode. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
+     > Make sure you have installed a `blocklet store` on your own blocklet server. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
 
   ```shell
   blocklet config set store {store url}
@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-static/vue/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue
 title: Blocklet Template Vue
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue

package/template-static/vue2/README.md

@@ -28,17 +28,17 @@ This blocklet is a static project, which means this is a frontend application. I
 
 ## Development
 
-1. Make sure you have [@abtnode/cli](https://www.npmjs.com/package/@abtnode/cli) installed
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
 
-   Blocklet needs abtnode as a dependency. So you need to install it first.  
-   `npm install -g @abtnode/cli`  
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
 
-2. Init abtnode & start abtnode
+2. Init blocklet server & start blocklet server
 
-   Before starting an abtnode, you need to init abtnode.  
-   `abtnode init --mode=debug`  
-   `abtnode start`  
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
    See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
 
 3. Go to the project directory `cd [name]`
@@ -51,12 +51,12 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 
 ## Deploy
 
-- If you want to deploy this blocklet to local abtnode, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
+- If you want to deploy this blocklet to local blocklet server, you can use `blocklet deploy .blocklet/bundle` command(Make sure the blocklet is bundled before deployment.)
   > Or you can simply use `npm run deploy` command.
-- If you want to deploy this blocklet to remote abtnode, you can use the command below.
+- If you want to deploy this blocklet to remote blocklet server, you can use the command below.
 
   ```shell
-  blocklet deploy .blocklet/bundle --endpoint {your abtnode url} --access-key {abtnode access key} --access-secret {abtnode access secret}
+  blocklet deploy .blocklet/bundle --endpoint {your blocklet server url} --access-key {blocklet server access key} --access-secret {blocklet server access secret}
   ```
 
   > Make sure the blocklet is bundled before deployment.
@@ -77,7 +77,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
   1. [https://store.blocklet.dev/](https://store.blocklet.dev/)
   2. [https://dev.store.blocklet.dev/](https://dev.store.blocklet.dev/)
   3. A blocklet store started by yourself.
-     > Make sure you have installed a `blocklet store` on your own abtnode. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
+     > Make sure you have installed a `blocklet store` on your own blocklet server. Check it on here: [https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ](https://store.blocklet.dev/blocklet/z8ia29UsENBg6tLZUKi2HABj38Cw1LmHZocbQ)
 
   ```shell
   blocklet config set store {store url}
@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-static/vue2/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue2
 title: Blocklet Template Vue2
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue

package/CHANGELOG.md

@@ -1,74 +0,0 @@
-## 0.2.8 (十一月 26, 2021)
-
-- feat: rebrand blocklet registry -> blocklet store
-
-## 0.2.7 (十一月 21, 2021)
-
-- chore: prettier default useTabs: false
-
-## 0.2.6 (十一月 20, 2021)
-
-- feat: add vue2 + @vue/cli template
-
-## 0.2.5 (十一月 20, 2021)
-
-- feat: add vite + vue3 template
-
-## 0.2.4 (October 28, 2021)
-
-- chore: bump deps to latest
-
-## 0.2.3 (十一月 08, 2021)
-
-- chore: update README.md
-- chore: remove sharp
-
-## 0.2.2 (十月 19, 2021)
-
-- chore: use blocklet/sdk WalletHandlers
-
-## 0.2.1 (十月 15, 2021)
-
-- feat: use action-workflow
-
-## 0.2.0 (九月 30, 2021)
-
-- feat: add npm script "upload"
-- fix #25
-- fix #22
-- fix #21
-- fix #24
-- fix #23
-
-## 0.1.7 (八月 12, 2021)
-
-- feat: support generate did
-- fix: remove yarn command
-
-## 0.1.6 (八月 06, 2021)
-
-- fix: [#8](https://github.com/blocklet/create-blocklet/issues/8)
-
-## 0.1.5 (八月 03, 2021)
-
-- chore: enhanced use of blocklet command
-
-## 0.1.4 (八月 02, 2021)
-
-- fix: add 'lib' to npm publish files
-
-## 0.1.3 (八月 02, 2021)
-
-- feat: add react-dom-router
-- fix: #4
-- fix: #3
-- fix: #2
-- fix: #1
-
-## 0.1.2 (七月 23, 2021)
-
-- fix: dapp npm bundle
-
-## 0.1.1 (七月 23, 2021)
-
-- fix: add folder to npm publish

package/lib/abtnode.js

@@ -1,45 +0,0 @@
-import semver from 'semver';
-import { getOutput } from './index.js';
-
-export function checkAbtnodeInstalled() {
-  const output = getOutput('which abtnode');
-  return !!output;
-}
-
-export function getAbtnodeVersion() {
-  const output = getOutput('abtnode --version');
-  return output.trim();
-}
-
-export function getAbtnodeStatus() {
-  const output = getOutput('abtnode status');
-  const [matchStr] = output.match(/ABT Node status:[\s\S]*?\n/gm) || [];
-  if (!matchStr) {
-    return 'stop';
-  }
-  const status = matchStr.replace(/ABT Node status:[\s]*([\S]+)\n/gm, '$1');
-  return status.toLowerCase();
-}
-export function checkAbtnodeRunning() {
-  const status = getAbtnodeStatus();
-  return status === 'running';
-}
-
-export function checkSatisfiedVersion() {
-  const output = getOutput('abtnode --version');
-  const version = output.trim();
-  return semver.satisfies(version, '>= 1.5.10');
-}
-
-export function getAbtnodeDirectory() {
-  const output = getOutput('abtnode status');
-  const [matchStr] = output.match(/ABT Node Data Directory:[\s\S]*?\n/gm) || [];
-  if (!matchStr) return null;
-
-  const directory = matchStr.replace(/ABT Node Data Directory:[\s]*([\S]+)\/\.abtnode\n/gm, '$1');
-  return directory;
-}
-
-const dic = getAbtnodeDirectory();
-
-console.log(dic);

package/template-dapp/react/server/middlewares/user.js

@@ -1,10 +0,0 @@
-module.exports = (req, res, next) => {
-  if (req.headers['x-user-did']) {
-    req.user = {
-      did: req.headers['x-user-did'],
-      role: req.headers['x-user-role'],
-      fullName: decodeURIComponent(req.headers['x-user-fullname']),
-    };
-  }
-  next();
-};

package/template-dapp/vue/server/middlewares/user.js

@@ -1,10 +0,0 @@
-module.exports = (req, res, next) => {
-  if (req.headers['x-user-did']) {
-    req.user = {
-      did: req.headers['x-user-did'],
-      role: req.headers['x-user-role'],
-      fullName: decodeURIComponent(req.headers['x-user-fullname']),
-    };
-  }
-  next();
-};

package/template-dapp/vue2/server/middlewares/user.js

@@ -1,10 +0,0 @@
-module.exports = (req, res, next) => {
-  if (req.headers['x-user-did']) {
-    req.user = {
-      did: req.headers['x-user-did'],
-      role: req.headers['x-user-role'],
-      fullName: decodeURIComponent(req.headers['x-user-fullname']),
-    };
-  }
-  next();
-};