@abtnode/blocklet-services 1.16.19-beta-e6aac665 → 1.16.19-beta-7b2db880

package/api/libs/connect/v1.js

@@ -66,11 +66,7 @@ module.exports = (node, opts) => {
 
   const handlerOpts = {
     authenticator,
-    tokenStorage: new DynamicStorage({
-      dbPath: path.join(opts.dataDir, 'connections.db'),
-      model: 'Connection',
-      primaryKey: 'token',
-    }),
+    tokenStorage: new DynamicStorage({ dbPath: path.join(opts.dataDir, 'connections.db') }),
     sendNotificationFn: async (connectedDid, message, { req }) => {
       const { wallet } = await req.getBlockletInfo();
       return sendToUser(

package/api/libs/connect/v2.js

@@ -22,11 +22,7 @@ module.exports = (node, opts) => {
   const handlers = createHandlers({
     logger,
     authenticator,
-    storage: new DynamicStorage({
-      dbPath: path.join(opts.dataDir, 'connections.db'),
-      model: 'ConnectionV2',
-      primaryKey: 'sessionId',
-    }),
+    storage: new DynamicStorage({ dbPath: path.join(opts.dataDir, 'connections.db'), v2: true }),
     socketPathname: `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/connect/relay/websocket`,
     sendNotificationFn: async (connectedDid, message, { request }) => {
       const { wallet } = await request.getBlockletInfo();

package/api/libs/image.js

@@ -130,68 +130,6 @@ const isImageRequest = (req) => {
 
 const getImageContentType = (extension) => (extension === 'svg' ? 'image/svg+xml' : `image/${extension}`);
 
-const tasks = {};
-const processAndRespond = (req, res, cacheDir, getSrc, ext, sendOptions = { maxAge: '356d', immutable: true }) => {
-  if (fs.existsSync(cacheDir) === false) {
-    fs.mkdirSync(cacheDir, { recursive: true });
-  }
-
-  const params = req.imageFilter;
-  const extension = toLower(ext || path.extname(req.path).slice(1));
-
-  // NOTE: 不要使用 `req.accepts('image/webp')`，这里需要排除掉 `Accept: */*` 和 `Accept: image/*` 的情况
-  const acceptWebp = req.accepts().includes('image/webp');
-  if (!acceptWebp) {
-    if (params.f === 'webp') {
-      params.f = undefined;
-    }
-    if ((!extension || extension === 'webp') && !params.f) {
-      params.f = 'png';
-    }
-  }
-  if (!extension && !params.f) {
-    params.f = 'png';
-  }
-
-  if (!extension && !params.f) {
-    res.status(400).send('Image filter failed: either extension or format must be specified');
-    return;
-  }
-
-  const cacheKey = md5(stringify({ target: req.target, path: req.originalUrl, params }));
-  const destPath = getCacheFilePath(cacheDir, `${cacheKey}.${params.f || extension}`);
-  if (fs.existsSync(destPath)) {
-    res.header('Content-Type', getImageContentType(params.f || extension));
-    res.sendFile(destPath, sendOptions);
-    return;
-  }
-
-  // do the convert
-  tasks[cacheKey] ??= getSrc(req)
-    .then(([src, _extension]) => processImage(src, toLower(_extension), destPath, params))
-    .finally(() => {
-      setTimeout(() => {
-        delete tasks[cacheKey];
-      }, 1000);
-    });
-
-  tasks[cacheKey]
-    .then(() => {
-      logger.info('image filter succeed', { params, url: req.originalUrl, destPath });
-      res.header('Content-Type', getImageContentType(params.f || extension));
-      res.sendFile(destPath, sendOptions);
-    })
-    .catch((err) => {
-      logger.error('image filter failed', { error: err, params, url: req.url });
-      if (params.e) {
-        res.status(500).send(`Image service error: ${err.message}`);
-      } else {
-        res.status(500);
-        res.sendFile(errorImage, { maxAge: 0 });
-      }
-    });
-};
-
 const processImage = (src, extension, dest, params) => {
   return new Promise((resolve, reject) => {
     // output stream
@@ -282,6 +220,68 @@ const processImage = (src, extension, dest, params) => {
   });
 };
 
+const tasks = {};
+const processAndRespond = (req, res, cacheDir, getSrc, ext, sendOptions = { maxAge: '356d', immutable: true }) => {
+  if (fs.existsSync(cacheDir) === false) {
+    fs.mkdirSync(cacheDir, { recursive: true });
+  }
+
+  const params = req.imageFilter;
+  const extension = toLower(ext || path.extname(req.path).slice(1));
+
+  // NOTE: 不要使用 `req.accepts('image/webp')`，这里需要排除掉 `Accept: */*` 和 `Accept: image/*` 的情况
+  const acceptWebp = req.accepts().includes('image/webp');
+  if (!acceptWebp) {
+    if (params.f === 'webp') {
+      params.f = undefined;
+    }
+    if ((!extension || extension === 'webp') && !params.f) {
+      params.f = 'png';
+    }
+  }
+  if (!extension && !params.f) {
+    params.f = 'png';
+  }
+
+  if (!extension && !params.f) {
+    res.status(400).send('Image filter failed: either extension or format must be specified');
+    return;
+  }
+
+  const cacheKey = md5(stringify({ target: req.target, path: req.originalUrl, params }));
+  const destPath = getCacheFilePath(cacheDir, `${cacheKey}.${params.f || extension}`);
+  if (fs.existsSync(destPath)) {
+    res.header('Content-Type', getImageContentType(params.f || extension));
+    res.sendFile(destPath, sendOptions);
+    return;
+  }
+
+  // do the convert
+  tasks[cacheKey] ??= getSrc(req)
+    .then(([src, _extension]) => processImage(src, toLower(_extension), destPath, params))
+    .finally(() => {
+      setTimeout(() => {
+        delete tasks[cacheKey];
+      }, 1000);
+    });
+
+  tasks[cacheKey]
+    .then(() => {
+      logger.info('image filter succeed', { params, url: req.originalUrl, destPath });
+      res.header('Content-Type', getImageContentType(params.f || extension));
+      res.sendFile(destPath, sendOptions);
+    })
+    .catch((err) => {
+      logger.error('image filter failed', { error: err, params, url: req.url });
+      if (params.e) {
+        res.status(500).send(`Image service error: ${err.message}`);
+      } else {
+        res.status(500);
+        res.sendFile(errorImage, { maxAge: 0 });
+      }
+    });
+};
+
 module.exports = {
   isImageAccepted,
   isImageRequest,

package/api/libs/open-graph/emoji.js

@@ -5,8 +5,6 @@ const fetch = require('node-fetch').default;
 const U200D = String.fromCharCode(8205); // zero-width joiner
 const UFE0Fg = /\uFE0F/g; // variation selector regex
 
-const getIconCode = (char) => toCodePoint(char.indexOf(U200D) < 0 ? char.replace(UFE0Fg, '') : char);
-
 const toCodePoint = (unicodeSurrogates) => {
   const r = [];
   let c = 0;
@@ -26,6 +24,8 @@ const toCodePoint = (unicodeSurrogates) => {
   return r.join('-');
 };
 
+const getIconCode = (char) => toCodePoint(char.indexOf(U200D) < 0 ? char.replace(UFE0Fg, '') : char);
+
 const apis = {
   twemoji: (code) => `https://cdn.jsdelivr.net/gh/twitter/twemoji@14.0.2/assets/svg/${code.toLowerCase()}.svg`,
   openmoji: 'https://cdn.jsdelivr.net/npm/@svgmoji/openmoji@2.0.0/svg/',

package/api/libs/open-graph/index.js

@@ -107,6 +107,7 @@ const getOgImage = ({ input, info, cacheDir, format, tmpDir }) => {
     return destPath;
   }
 
+  // eslint-disable-next-line no-use-before-define
   generateTasks[cacheKey] ??= generateOgImage(params, tmpDir).finally(() => {
     setTimeout(() => {
       delete generateTasks[cacheKey];

package/api/routes/oauth.js

@@ -75,6 +75,7 @@ async function login(req, node, options) {
     throw new ApiError(400, t('oauthCantBeOwner', locale));
   }
   const { did: teamDid, wallet: blockletWallet, secret, appUrl } = await req.getBlockletInfo();
+
   let userWallet;
   let oauthInfo;
 
@@ -94,6 +95,7 @@ async function login(req, node, options) {
     oauthInfo = await authClient.getProfile(token);
     userWallet = fromAppDid(oauthInfo.sub, blockletWallet.secretKey);
   }
+
   const userDid = userWallet.address;
   const userPk = userWallet.publicKey;
 
@@ -275,6 +277,8 @@ async function invite(req, node, options) {
   let userWallet;
   let oauthInfo;
 
+  const { did: teamDid, wallet: blockletWallet, secret } = await req.getBlockletInfo();
+
   // NOTICE: 如果是统一登录，则向 master 站点发起 oauth 登录请求，auth0 的账户信息必须由 master 来生成
   if (sourceAppPid) {
     const data = await getOAuthUserInfo({
@@ -292,7 +296,7 @@ async function invite(req, node, options) {
     oauthInfo = await authClient.getProfile(token);
     userWallet = fromAppDid(oauthInfo.sub, blockletWallet.secretKey);
   }
-  const { did: teamDid, wallet: blockletWallet, secret } = await req.getBlockletInfo();
+
   const nodeInfo = await req.getNodeInfo();
   let userDid = userWallet.address;
   let userPk = userWallet.publicKey;

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.6f748ae5.js",
+    "main.js": "/.well-known/service/static/static/js/main.09227d84.js",
     "static/js/9314.f0add972.chunk.js": "/.well-known/service/static/static/js/9314.f0add972.chunk.js",
     "static/js/6218.4f3036a7.chunk.js": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js",
     "static/js/4076.8055ce74.chunk.js": "/.well-known/service/static/static/js/4076.8055ce74.chunk.js",
@@ -12,7 +12,7 @@
     "static/js/779.73350f02.chunk.js": "/.well-known/service/static/static/js/779.73350f02.chunk.js",
     "static/js/8622.6aa0a4d4.chunk.js": "/.well-known/service/static/static/js/8622.6aa0a4d4.chunk.js",
     "static/js/1148.5ccba08e.chunk.js": "/.well-known/service/static/static/js/1148.5ccba08e.chunk.js",
-    "static/js/8944.939de854.chunk.js": "/.well-known/service/static/static/js/8944.939de854.chunk.js",
+    "static/js/8944.5b8c231c.chunk.js": "/.well-known/service/static/static/js/8944.5b8c231c.chunk.js",
     "static/js/5468.21a861b9.chunk.js": "/.well-known/service/static/static/js/5468.21a861b9.chunk.js",
     "static/js/9982.4f1ebb7f.chunk.js": "/.well-known/service/static/static/js/9982.4f1ebb7f.chunk.js",
     "static/js/1359.add26d23.chunk.js": "/.well-known/service/static/static/js/1359.add26d23.chunk.js",
@@ -92,7 +92,7 @@
     "static/js/9107.7f32925d.chunk.js": "/.well-known/service/static/static/js/9107.7f32925d.chunk.js",
     "static/css/3154.e954fcda.chunk.css": "/.well-known/service/static/static/css/3154.e954fcda.chunk.css",
     "static/js/8016.3ef64a2c.chunk.js": "/.well-known/service/static/static/js/8016.3ef64a2c.chunk.js",
-    "static/js/8181.6c2a7dcb.chunk.js": "/.well-known/service/static/static/js/8181.6c2a7dcb.chunk.js",
+    "static/js/8181.bc510ea3.chunk.js": "/.well-known/service/static/static/js/8181.bc510ea3.chunk.js",
     "static/js/9657.b03b88e5.chunk.js": "/.well-known/service/static/static/js/9657.b03b88e5.chunk.js",
     "static/js/468.bbc69bbf.chunk.js": "/.well-known/service/static/static/js/468.bbc69bbf.chunk.js",
     "static/media/ubuntu-mono-all-400-normal.woff": "/.well-known/service/static/static/media/ubuntu-mono-all-400-normal.c879328bc62e9c68268f.woff",
@@ -119,7 +119,7 @@
     "index.html": "/.well-known/service/static/index.html",
     "static/media/space-connected.svg": "/.well-known/service/static/static/media/space-connected.9a4e18fd2bc7d065191b0d241a131c28.svg",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.6f748ae5.js.map": "/.well-known/service/static/static/js/main.6f748ae5.js.map",
+    "main.09227d84.js.map": "/.well-known/service/static/static/js/main.09227d84.js.map",
     "9314.f0add972.chunk.js.map": "/.well-known/service/static/static/js/9314.f0add972.chunk.js.map",
     "6218.4f3036a7.chunk.js.map": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js.map",
     "4076.8055ce74.chunk.js.map": "/.well-known/service/static/static/js/4076.8055ce74.chunk.js.map",
@@ -130,7 +130,7 @@
     "779.73350f02.chunk.js.map": "/.well-known/service/static/static/js/779.73350f02.chunk.js.map",
     "8622.6aa0a4d4.chunk.js.map": "/.well-known/service/static/static/js/8622.6aa0a4d4.chunk.js.map",
     "1148.5ccba08e.chunk.js.map": "/.well-known/service/static/static/js/1148.5ccba08e.chunk.js.map",
-    "8944.939de854.chunk.js.map": "/.well-known/service/static/static/js/8944.939de854.chunk.js.map",
+    "8944.5b8c231c.chunk.js.map": "/.well-known/service/static/static/js/8944.5b8c231c.chunk.js.map",
     "5468.21a861b9.chunk.js.map": "/.well-known/service/static/static/js/5468.21a861b9.chunk.js.map",
     "9982.4f1ebb7f.chunk.js.map": "/.well-known/service/static/static/js/9982.4f1ebb7f.chunk.js.map",
     "1359.add26d23.chunk.js.map": "/.well-known/service/static/static/js/1359.add26d23.chunk.js.map",
@@ -210,12 +210,12 @@
     "9107.7f32925d.chunk.js.map": "/.well-known/service/static/static/js/9107.7f32925d.chunk.js.map",
     "3154.e954fcda.chunk.css.map": "/.well-known/service/static/static/css/3154.e954fcda.chunk.css.map",
     "8016.3ef64a2c.chunk.js.map": "/.well-known/service/static/static/js/8016.3ef64a2c.chunk.js.map",
-    "8181.6c2a7dcb.chunk.js.map": "/.well-known/service/static/static/js/8181.6c2a7dcb.chunk.js.map",
+    "8181.bc510ea3.chunk.js.map": "/.well-known/service/static/static/js/8181.bc510ea3.chunk.js.map",
     "9657.b03b88e5.chunk.js.map": "/.well-known/service/static/static/js/9657.b03b88e5.chunk.js.map",
     "468.bbc69bbf.chunk.js.map": "/.well-known/service/static/static/js/468.bbc69bbf.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.6f748ae5.js"
+    "static/js/main.09227d84.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico?imageFilter=resize&w=32"/><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><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.6f748ae5.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.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="icon" href="/favicon.ico?imageFilter=resize&w=32"/><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><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.09227d84.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>