@abtnode/blocklet-services 1.8.16 → 1.8.19

package/api/services/auth/index.js

@@ -2,6 +2,7 @@
 const get = require('lodash/get');
 const minimatch = require('minimatch');
 const bearerToken = require('express-bearer-token');
+const getBlocklet403Template = require('@abtnode/router-templates/lib/blocklet-403');
 
 const validators = require('@blocklet/sdk/lib/validators');
 const {
@@ -186,12 +187,22 @@ const init = ({ node, options }) => {
 
     if (blocked) {
       if (!authenticated) {
-        res.redirect(getRedirectUrl({ req, pagePath: '/login' }));
+        if (req.accepts(['html', 'json']) === 'html') {
+          res.redirect(getRedirectUrl({ req, pagePath: '/login' }));
+        } else {
+          res.status(401).json({ code: 401, error: 'Unauthorized' });
+        }
         return;
       }
 
       if (!authorized) {
-        res.status(403).json({ code: 'forbidden', error: 'not allowed' });
+        if (req.accepts(['html', 'json']) === 'html') {
+          const nodeInfo = await req.getNodeInfo();
+          const blocklet = await req.getBlocklet();
+          res.send(getBlocklet403Template(blocklet, nodeInfo));
+        } else {
+          res.status(403).json({ code: 403, error: 'Forbidden' });
+        }
         return;
       }
     }

package/api/state/index.js

@@ -1,30 +1,13 @@
-const BaseState = require('@abtnode/core/lib/states/base');
-const MessageState = require('./message');
+const stateFactory = require('@abtnode/db/lib/factory');
 
-const states = {};
+const MessageState = require('./message');
 
-// eslint-disable-next-line no-unused-vars
-const init = (dataDir, options = {}) => {
-  const messageState = new MessageState(dataDir);
+const init = (dataDir, options) => {
+  const messageState = new MessageState(dataDir, options);
 
-  Object.assign(states, {
+  return {
     message: messageState,
-  });
+  };
 };
 
-module.exports = new Proxy(
-  {},
-  {
-    get(target, prop) {
-      if (prop === 'init') {
-        return init;
-      }
-
-      if (states[prop] instanceof BaseState) {
-        return states[prop];
-      }
-
-      throw new Error(`State ${String(prop)} may not be initialized`);
-    },
-  }
-);
+module.exports = stateFactory(init);

package/api/state/message.js

@@ -5,10 +5,12 @@ class MessageState extends BaseState {
   constructor(baseDir, options = {}) {
     super(baseDir, { filename: 'message.db', ...options });
 
-    this.db.ensureIndex({ fieldName: 'did' }, (error) => {
-      if (error) {
-        logger.error('ensure index failed', { error });
-      }
+    this.onReady(() => {
+      this.ensureIndex({ fieldName: 'did' }, (error) => {
+        if (error) {
+          logger.error('ensure index failed', { error });
+        }
+      });
     });
   }
 

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.699663ce.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.5cdb1ae7.js",
     "static/js/560.60bd29f3.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/560.60bd29f3.chunk.js",
     "static/js/255.a8eba332.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.a8eba332.chunk.js",
     "static/js/472.c389b098.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/472.c389b098.chunk.js",
@@ -12,7 +12,7 @@
     "static/js/597.7fc9dfe2.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/597.7fc9dfe2.chunk.js",
     "static/js/244.6bfddb66.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/244.6bfddb66.chunk.js",
     "static/js/699.bd2c7001.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/699.bd2c7001.chunk.js",
-    "static/js/575.e131ca88.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/575.e131ca88.chunk.js",
+    "static/js/575.ceda4e9e.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/575.ceda4e9e.chunk.js",
     "static/js/532.2768ffe6.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/532.2768ffe6.chunk.js",
     "static/media/ubuntu-mono-all-400-normal.woff": "/.blocklet/proxy/blocklet-service/static/media/ubuntu-mono-all-400-normal.c879328bc62e9c68268f.woff",
     "static/media/lato-all-400-normal.woff": "/.blocklet/proxy/blocklet-service/static/media/lato-all-400-normal.3dc1eff492ab1f598560.woff",
@@ -34,7 +34,7 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.699663ce.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.699663ce.js.map",
+    "main.5cdb1ae7.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.5cdb1ae7.js.map",
     "560.60bd29f3.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/560.60bd29f3.chunk.js.map",
     "255.a8eba332.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.a8eba332.chunk.js.map",
     "472.c389b098.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/472.c389b098.chunk.js.map",
@@ -45,11 +45,11 @@
     "597.7fc9dfe2.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/597.7fc9dfe2.chunk.js.map",
     "244.6bfddb66.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/244.6bfddb66.chunk.js.map",
     "699.bd2c7001.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/699.bd2c7001.chunk.js.map",
-    "575.e131ca88.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/575.e131ca88.chunk.js.map",
+    "575.ceda4e9e.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/575.ceda4e9e.chunk.js.map",
     "532.2768ffe6.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/532.2768ffe6.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.699663ce.js"
+    "static/js/main.5cdb1ae7.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/.well-known/service/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.699663ce.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/.well-known/service/static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.5cdb1ae7.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>