create-blocklet 0.2.9 → 0.2.13

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

@@ -27,8 +27,8 @@ jobs:
           skip-upload: false
           skip-deploy: false
           bundle-command: yarn bundle
-          store-endpoint: ${{ secrets.STORE_ENDPOINT_STAGING }}
-          store-access-token: ${{ secrets.STORE_ACCESS_TOKEN_STAGING }}
+          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 }}

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));
@@ -201,11 +196,11 @@ async function init() {
 
   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) {
+  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.`);
@@ -216,9 +211,9 @@ async function init() {
     // 已安装 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) {
+    if (isServerRunning) {
       // blocklet server 已经启动
-      const serverPath = getAbtnodeDirectory();
+      const serverPath = getServerDirectory();
       console.log(cyan(`cd ${serverPath}`));
       console.log(cyan('blocklet server stop'));
       console.log(cyan('npm install -g @blocklet/cli'));
@@ -230,7 +225,7 @@ async function init() {
       console.log(cyan('npm install -g @blocklet/cli'));
       console.log(cyan('blocklet server start -a'));
     }
-  } else if (!isAbtnodeRunning) {
+  } 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');

package/lib/{abtnode.js → server.js}

@@ -1,27 +1,27 @@
 import semver from 'semver';
 import { getOutput } from './index.js';
 
-export function checkAbtnodeInstalled() {
+export function checkServerInstalled() {
   const output = getOutput('which blocklet');
   return !!output;
 }
 
-export function getAbtnodeVersion() {
+export function getServerVersion() {
   const output = getOutput('blocklet --version');
   return output.trim();
 }
 
-export function getAbtnodeStatus() {
+export function getServerStatus() {
   const output = getOutput('blocklet server status');
-  const [matchStr] = output.match(/ABT Node status:[\s\S]*?\n/gm) || [];
+  const [matchStr] = output.match(/Blocklet Server status:[\s\S]*?\n/g) || [];
   if (!matchStr) {
     return 'stop';
   }
-  const status = matchStr.replace(/ABT Node status:[\s]*([\S]+)\n/gm, '$1');
+  const status = matchStr.replace(/Blocklet Server status:\s*(\S+)\s*\S*\n*[\s\S]*/gm, '$1');
   return status.toLowerCase();
 }
-export function checkAbtnodeRunning() {
-  const status = getAbtnodeStatus();
+export function checkServerRunning() {
+  const status = getServerStatus();
   return status === 'running';
 }
 
@@ -31,7 +31,7 @@ export function checkSatisfiedVersion() {
   return semver.satisfies(version, '>= 1.6.1');
 }
 
-export function getAbtnodeDirectory() {
+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;
@@ -39,7 +39,3 @@ export function getAbtnodeDirectory() {
   const directory = matchStr.replace(/Blocklet Server Data Directory:[\s]*([\S]+)\/\.abtnode\n/gm, '$1');
   return directory;
 }
-
-const dic = getAbtnodeDirectory();
-
-console.log(dic);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.2.9",
+  "version": "0.2.13",
   "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

@@ -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/index.js

@@ -47,7 +47,7 @@ if (isProduction) {
   app.use(router);
 }
 
-const port = parseInt(process.env.BLOCKLET_PORT || process.env.APP_PORT, 10) || 3030;
+const port = parseInt(process.env.BLOCKLET_PORT, 10) || 3030;
 
 app.listen(port, (err) => {
   if (err) throw err;

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

@@ -1,26 +1,17 @@
 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 logger = require('./logger');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
 
-const appSk = process.env.APP_SK || process.env.BLOCKLET_APP_SK;
-const wallet = fromSecretKey(appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
+const env = require('./env');
 
+const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
-
-const handlers = new WalletHandlers({
+const handlers = new WalletHandler({
   authenticator,
-  tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({
-    dbPath: path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db'),
-    onload: (err) => {
-      if (err) {
-        logger.error(`Failed to load database from ${path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db')}`, err);
-      }
-    },
+    dbPath: path.join(env.dataDir, 'auth.db'),
   }),
 });
 

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,6 @@
+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/react/src/pages/home.js

@@ -1,21 +1,14 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
 import logo from '../logo.svg';
-import api from '../libs/api';
 
 const Home = () => {
-  const [env, setEnv] = useState({});
-  useEffect(async () => {
-    const { data } = await api.get('/api/env');
-    setEnv(data);
-  }, []);
-
   return (
     <header className="app-header">
       <img src={logo} className="app-logo" alt="logo" />
       <pre style={{ textAlign: 'left' }}>
-        <code>{JSON.stringify(env, null, 2)}</code>
+        <code>{JSON.stringify(window.blocklet, null, 2)}</code>
       </pre>
       <Link className="app-link" to="/about">
         About

package/template-dapp/vue/README.md

@@ -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/index.js

@@ -47,7 +47,7 @@ if (isProduction) {
   app.use(router);
 }
 
-const port = parseInt(process.env.BLOCKLET_PORT || process.env.APP_PORT, 10) || 3030;
+const port = parseInt(process.env.BLOCKLET_PORT, 10) || 3030;
 
 app.listen(port, (err) => {
   if (err) throw err;

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

@@ -1,26 +1,17 @@
 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 logger = require('./logger');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
 
-const appSk = process.env.APP_SK || process.env.BLOCKLET_APP_SK;
-const wallet = fromSecretKey(appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
+const env = require('./env');
 
+const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
-
-const handlers = new WalletHandlers({
+const handlers = new WalletHandler({
   authenticator,
-  tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({
-    dbPath: path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db'),
-    onload: (err) => {
-      if (err) {
-        logger.error(`Failed to load database from ${path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db')}`, err);
-      }
-    },
+    dbPath: path.join(env.dataDir, 'auth.db'),
   }),
 });
 

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,6 @@
+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/src/App.vue

@@ -3,14 +3,6 @@ import { ref } from 'vue';
 // This starter template is using Vue 3 <script setup> SFCs
 // Check out https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup
 import HelloWorld from './components/HelloWorld.vue';
-import api from './libs/api';
-
-const envData = ref({});
-
-(async () => {
-  const { data } = await api.get('/api/env');
-  envData.value = data;
-})();
 </script>
 
 <template>
@@ -18,7 +10,7 @@ const envData = ref({});
   <HelloWorld msg="Hello Vue 3 + Vite" />
   <div :style="{ display: 'flex', justifyContent: 'center' }">
     <pre :style="{ textAlign: 'left' }">
-<code>{{ JSON.stringify(envData, null, 2) }}</code>
+<code>{{ JSON.stringify(window.blocklet, null, 2) }}</code>
     </pre>
   </div>
 </template>

package/template-dapp/vue2/README.md

@@ -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/index.js

@@ -47,7 +47,7 @@ if (isProduction) {
   app.use(router);
 }
 
-const port = parseInt(process.env.BLOCKLET_PORT || process.env.APP_PORT, 10) || 3030;
+const port = parseInt(process.env.BLOCKLET_PORT, 10) || 3030;
 
 app.listen(port, (err) => {
   if (err) throw err;

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

@@ -1,26 +1,17 @@
 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 logger = require('./logger');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
 
-const appSk = process.env.APP_SK || process.env.BLOCKLET_APP_SK;
-const wallet = fromSecretKey(appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
+const env = require('./env');
 
+const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
-
-const handlers = new WalletHandlers({
+const handlers = new WalletHandler({
   authenticator,
-  tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({
-    dbPath: path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db'),
-    onload: (err) => {
-      if (err) {
-        logger.error(`Failed to load database from ${path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db')}`, err);
-      }
-    },
+    dbPath: path.join(env.dataDir, 'auth.db'),
   }),
 });
 

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,6 @@
+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/src/pages/Home.vue

@@ -7,7 +7,7 @@
     <HelloWorld msg="Welcome to Your Vue.js App" />
     <div :style="{ display: 'flex', justifyContent: 'center' }">
       <pre :style="{ textAlign: 'left' }">
-<code>{{ JSON.stringify(envData, null, 2) }}</code>
+<code>{{ JSON.stringify(window.blocklet, null, 2) }}</code>
     </pre>
     </div>
   </div>
@@ -21,16 +21,6 @@ export default {
   components: {
     HelloWorld,
   },
-  data() {
-    return {
-      envData: {},
-    };
-  },
-  mounted() {
-    api.get('/api/env').then(({ data }) => {
-      this.envData = data;
-    });
-  },
 };
 </script>
 

package/template-static/react/README.md

@@ -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

@@ -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

@@ -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/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();
-};