create-blocklet 0.2.11 → 0.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.2.11",
+  "version": "0.2.14",
   "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/blocklet.yml

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

@@ -4,16 +4,15 @@ 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/blocklet.yml

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

@@ -4,16 +4,15 @@ 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/blocklet.yml

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

@@ -4,16 +4,15 @@ 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-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();
-};