@abtnode/blocklet-services 1.16.18-beta-bb4ebacc → 1.16.18-beta-f4777312

package/api/libs/image.js

@@ -128,6 +128,8 @@ const isImageRequest = (req) => {
   return true;
 };
 
+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) {
@@ -159,7 +161,7 @@ const processAndRespond = (req, res, cacheDir, getSrc, ext, sendOptions = { maxA
   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', `image/${params.f || extension}`);
+    res.header('Content-Type', getImageContentType(params.f || extension));
     res.sendFile(destPath, sendOptions);
     return;
   }
@@ -176,7 +178,7 @@ const processAndRespond = (req, res, cacheDir, getSrc, ext, sendOptions = { maxA
   tasks[cacheKey]
     .then(() => {
       logger.info('image filter succeed', { params, url: req.originalUrl, destPath });
-      res.header('Content-Type', `image/${params.f || extension}`);
+      res.header('Content-Type', getImageContentType(params.f || extension));
       res.sendFile(destPath, sendOptions);
     })
     .catch((err) => {
@@ -192,6 +194,21 @@ const processAndRespond = (req, res, cacheDir, getSrc, ext, sendOptions = { maxA
 
 const processImage = (src, extension, dest, params) => {
   return new Promise((resolve, reject) => {
+    // output stream
+    const out = fs.createWriteStream(dest);
+    out.on('close', () => {
+      resolve(dest);
+    });
+
+    out.on('error', (err) => {
+      reject(err);
+    });
+
+    if (extension === 'svg') {
+      src.pipe(out);
+      return;
+    }
+
     const {
       imageFilter,
       w: width,
@@ -251,16 +268,6 @@ const processImage = (src, extension, dest, params) => {
       pipeline.negate();
     }
 
-    // output stream
-    const out = fs.createWriteStream(dest);
-    out.on('close', () => {
-      resolve(dest);
-    });
-
-    out.on('error', (err) => {
-      reject(err);
-    });
-
     pipeline[format || EXTENSIONS[extension]]({ quality, progressive: !!progressive, force: true });
 
     pipeline.on('error', (err) => {

package/api/routes/federated.js

@@ -339,7 +339,10 @@ module.exports = {
             pendingUserList.push(
               limitSync(async () => {
                 await syncFnMaps[user.action]?.(
-                  { ...user, sourceAppPid: user.sourceAppPid === teamDid ? undefined : user.sourceAppPid },
+                  {
+                    ...user,
+                    sourceAppPid: user.sourceAppPid === teamDid ? null : user.sourceAppPid,
+                  },
                   { node, teamDid, dataDir }
                 );
               })

package/api/routes/oauth.js

@@ -64,7 +64,7 @@ function getAuthClient(blocklet, provider) {
 
 async function login(req, node, options) {
   const blocklet = await req.getBlocklet();
-  const { token, locale = 'en', provider, componentId, sourceAppPid, visitorId } = req.body;
+  const { token, locale = 'en', provider, componentId, sourceAppPid = null, visitorId } = req.body;
 
   if (!blocklet.settings?.owner) {
     throw new ApiError(400, t('oauthCantBeOwner', locale));
@@ -264,7 +264,15 @@ async function login(req, node, options) {
 }
 
 async function invite(req, node, options) {
-  const { locale, inviteId, token, baseUrl, provider = LOGIN_PROVIDER.AUTH0, sourceAppPid, visitorId } = req.body;
+  const {
+    locale,
+    inviteId,
+    token,
+    baseUrl,
+    provider = LOGIN_PROVIDER.AUTH0,
+    sourceAppPid = null,
+    visitorId,
+  } = req.body;
   const blocklet = await req.getBlocklet();
   let userWallet;
   let oauthInfo;
@@ -390,6 +398,7 @@ async function invite(req, node, options) {
       syncData.users.push({
         ...syncUserData,
         action: 'connectAccount',
+        // HACK: @zhanghan 这里会造成 master 中的用户也增加 sourceAppPid 字段，需要在 sync 接收端处理
         sourceAppPid: sourceAppPid || masterSite?.appPid,
       });
     }

package/api/routes/user.js

@@ -102,7 +102,7 @@ async function composeProfileData({ avatar, fullName, email }, { node, req, team
 
 async function loginWallet(
   { did, pk, avatar, email, fullName },
-  { node, req, locale, componentId, teamDid, updateInfo = true, sourceAppPid }
+  { node, req, locale, componentId, teamDid, updateInfo = true, sourceAppPid = null }
 ) {
   const provider = LOGIN_PROVIDER.WALLET;
   const { error } = loginWalletSchema.validate({
@@ -162,7 +162,7 @@ async function loginWallet(
 
 async function loginOAuth(
   { provider, id, avatar, email, fullName },
-  { node, req, locale, componentId, teamDid, blockletWallet, updateInfo = true, sourceAppPid }
+  { node, req, locale, componentId, teamDid, blockletWallet, updateInfo = true, sourceAppPid = null }
 ) {
   const { error } = loginOAuthSchema.validate({
     provider,
@@ -232,7 +232,7 @@ async function login(req, node, options) {
     locale = 'en',
     updateInfo = true,
     visitorId,
-    sourceAppPid,
+    sourceAppPid = null,
   } = req.body;
 
   const componentId = req.get('x-blocklet-component-id');
@@ -356,7 +356,7 @@ module.exports = {
      * @summary 暂时不允许用户注册，只允许登录
      */
     server.post(`${prefixApi}/loginByWallet`, async (req, res) => {
-      const { userDid, signature, walletOS, nonce, visitorId, passportId, sourceAppPid, locale } = req.body;
+      const { userDid, signature, walletOS, nonce, visitorId, passportId, sourceAppPid = null, locale } = req.body;
       const { error } = loginUserWalletSchema.validate({
         userDid,
         signature,

package/build/asset-manifest.json

@@ -1,10 +1,10 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.36b0deea.js",
+    "main.js": "/.well-known/service/static/static/js/main.6f9907fb.js",
     "static/js/9314.f0add972.chunk.js": "/.well-known/service/static/static/js/9314.f0add972.chunk.js",
-    "static/js/6218.9a4feced.chunk.js": "/.well-known/service/static/static/js/6218.9a4feced.chunk.js",
-    "static/js/4076.5ca97365.chunk.js": "/.well-known/service/static/static/js/4076.5ca97365.chunk.js",
+    "static/js/6218.4f3036a7.chunk.js": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js",
+    "static/js/4076.f5369a1d.chunk.js": "/.well-known/service/static/static/js/4076.f5369a1d.chunk.js",
     "static/js/6658.98f9956d.chunk.js": "/.well-known/service/static/static/js/6658.98f9956d.chunk.js",
     "static/js/3025.7c99c058.chunk.js": "/.well-known/service/static/static/js/3025.7c99c058.chunk.js",
     "static/js/7858.52930f63.chunk.js": "/.well-known/service/static/static/js/7858.52930f63.chunk.js",
@@ -20,8 +20,8 @@
     "static/js/6032.1001afd3.chunk.js": "/.well-known/service/static/static/js/6032.1001afd3.chunk.js",
     "static/js/4882.0435e418.chunk.js": "/.well-known/service/static/static/js/4882.0435e418.chunk.js",
     "static/js/5434.523d071d.chunk.js": "/.well-known/service/static/static/js/5434.523d071d.chunk.js",
-    "static/css/5547.5f9be15f.chunk.css": "/.well-known/service/static/static/css/5547.5f9be15f.chunk.css",
-    "static/js/5547.d68bfde3.chunk.js": "/.well-known/service/static/static/js/5547.d68bfde3.chunk.js",
+    "static/css/5547.e016de4c.chunk.css": "/.well-known/service/static/static/css/5547.e016de4c.chunk.css",
+    "static/js/5547.570ded36.chunk.js": "/.well-known/service/static/static/js/5547.570ded36.chunk.js",
     "static/js/3033.9fe46d7f.chunk.js": "/.well-known/service/static/static/js/3033.9fe46d7f.chunk.js",
     "static/js/3842.e1bb702b.chunk.js": "/.well-known/service/static/static/js/3842.e1bb702b.chunk.js",
     "static/js/3131.99541aca.chunk.js": "/.well-known/service/static/static/js/3131.99541aca.chunk.js",
@@ -41,9 +41,9 @@
     "static/js/4023.5fe8180a.chunk.js": "/.well-known/service/static/static/js/4023.5fe8180a.chunk.js",
     "static/js/8792.0f55707c.chunk.js": "/.well-known/service/static/static/js/8792.0f55707c.chunk.js",
     "static/js/3076.28658ffc.chunk.js": "/.well-known/service/static/static/js/3076.28658ffc.chunk.js",
-    "static/js/5569.a7e151fc.chunk.js": "/.well-known/service/static/static/js/5569.a7e151fc.chunk.js",
+    "static/js/5569.e4bfe697.chunk.js": "/.well-known/service/static/static/js/5569.e4bfe697.chunk.js",
     "static/js/2801.33d2f238.chunk.js": "/.well-known/service/static/static/js/2801.33d2f238.chunk.js",
-    "static/js/4461.26253c6a.chunk.js": "/.well-known/service/static/static/js/4461.26253c6a.chunk.js",
+    "static/js/4461.3cd698bf.chunk.js": "/.well-known/service/static/static/js/4461.3cd698bf.chunk.js",
     "static/js/5509.a196d497.chunk.js": "/.well-known/service/static/static/js/5509.a196d497.chunk.js",
     "static/js/5683.051a03c1.chunk.js": "/.well-known/service/static/static/js/5683.051a03c1.chunk.js",
     "static/js/7006.bb90b167.chunk.js": "/.well-known/service/static/static/js/7006.bb90b167.chunk.js",
@@ -58,7 +58,7 @@
     "static/js/556.e1875260.chunk.js": "/.well-known/service/static/static/js/556.e1875260.chunk.js",
     "static/js/2940.ce32ab3f.chunk.js": "/.well-known/service/static/static/js/2940.ce32ab3f.chunk.js",
     "static/js/840.5bc210dd.chunk.js": "/.well-known/service/static/static/js/840.5bc210dd.chunk.js",
-    "static/js/6629.376863d2.chunk.js": "/.well-known/service/static/static/js/6629.376863d2.chunk.js",
+    "static/js/6629.a4a3fb70.chunk.js": "/.well-known/service/static/static/js/6629.a4a3fb70.chunk.js",
     "static/js/9997.540afd6e.chunk.js": "/.well-known/service/static/static/js/9997.540afd6e.chunk.js",
     "static/js/2838.ec459fda.chunk.js": "/.well-known/service/static/static/js/2838.ec459fda.chunk.js",
     "static/js/3953.ddf8be86.chunk.js": "/.well-known/service/static/static/js/3953.ddf8be86.chunk.js",
@@ -119,10 +119,10 @@
     "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.36b0deea.js.map": "/.well-known/service/static/static/js/main.36b0deea.js.map",
+    "main.6f9907fb.js.map": "/.well-known/service/static/static/js/main.6f9907fb.js.map",
     "9314.f0add972.chunk.js.map": "/.well-known/service/static/static/js/9314.f0add972.chunk.js.map",
-    "6218.9a4feced.chunk.js.map": "/.well-known/service/static/static/js/6218.9a4feced.chunk.js.map",
-    "4076.5ca97365.chunk.js.map": "/.well-known/service/static/static/js/4076.5ca97365.chunk.js.map",
+    "6218.4f3036a7.chunk.js.map": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js.map",
+    "4076.f5369a1d.chunk.js.map": "/.well-known/service/static/static/js/4076.f5369a1d.chunk.js.map",
     "6658.98f9956d.chunk.js.map": "/.well-known/service/static/static/js/6658.98f9956d.chunk.js.map",
     "3025.7c99c058.chunk.js.map": "/.well-known/service/static/static/js/3025.7c99c058.chunk.js.map",
     "7858.52930f63.chunk.js.map": "/.well-known/service/static/static/js/7858.52930f63.chunk.js.map",
@@ -138,8 +138,8 @@
     "6032.1001afd3.chunk.js.map": "/.well-known/service/static/static/js/6032.1001afd3.chunk.js.map",
     "4882.0435e418.chunk.js.map": "/.well-known/service/static/static/js/4882.0435e418.chunk.js.map",
     "5434.523d071d.chunk.js.map": "/.well-known/service/static/static/js/5434.523d071d.chunk.js.map",
-    "5547.5f9be15f.chunk.css.map": "/.well-known/service/static/static/css/5547.5f9be15f.chunk.css.map",
-    "5547.d68bfde3.chunk.js.map": "/.well-known/service/static/static/js/5547.d68bfde3.chunk.js.map",
+    "5547.e016de4c.chunk.css.map": "/.well-known/service/static/static/css/5547.e016de4c.chunk.css.map",
+    "5547.570ded36.chunk.js.map": "/.well-known/service/static/static/js/5547.570ded36.chunk.js.map",
     "3033.9fe46d7f.chunk.js.map": "/.well-known/service/static/static/js/3033.9fe46d7f.chunk.js.map",
     "3842.e1bb702b.chunk.js.map": "/.well-known/service/static/static/js/3842.e1bb702b.chunk.js.map",
     "3131.99541aca.chunk.js.map": "/.well-known/service/static/static/js/3131.99541aca.chunk.js.map",
@@ -159,9 +159,9 @@
     "4023.5fe8180a.chunk.js.map": "/.well-known/service/static/static/js/4023.5fe8180a.chunk.js.map",
     "8792.0f55707c.chunk.js.map": "/.well-known/service/static/static/js/8792.0f55707c.chunk.js.map",
     "3076.28658ffc.chunk.js.map": "/.well-known/service/static/static/js/3076.28658ffc.chunk.js.map",
-    "5569.a7e151fc.chunk.js.map": "/.well-known/service/static/static/js/5569.a7e151fc.chunk.js.map",
+    "5569.e4bfe697.chunk.js.map": "/.well-known/service/static/static/js/5569.e4bfe697.chunk.js.map",
     "2801.33d2f238.chunk.js.map": "/.well-known/service/static/static/js/2801.33d2f238.chunk.js.map",
-    "4461.26253c6a.chunk.js.map": "/.well-known/service/static/static/js/4461.26253c6a.chunk.js.map",
+    "4461.3cd698bf.chunk.js.map": "/.well-known/service/static/static/js/4461.3cd698bf.chunk.js.map",
     "5509.a196d497.chunk.js.map": "/.well-known/service/static/static/js/5509.a196d497.chunk.js.map",
     "5683.051a03c1.chunk.js.map": "/.well-known/service/static/static/js/5683.051a03c1.chunk.js.map",
     "7006.bb90b167.chunk.js.map": "/.well-known/service/static/static/js/7006.bb90b167.chunk.js.map",
@@ -176,7 +176,7 @@
     "556.e1875260.chunk.js.map": "/.well-known/service/static/static/js/556.e1875260.chunk.js.map",
     "2940.ce32ab3f.chunk.js.map": "/.well-known/service/static/static/js/2940.ce32ab3f.chunk.js.map",
     "840.5bc210dd.chunk.js.map": "/.well-known/service/static/static/js/840.5bc210dd.chunk.js.map",
-    "6629.376863d2.chunk.js.map": "/.well-known/service/static/static/js/6629.376863d2.chunk.js.map",
+    "6629.a4a3fb70.chunk.js.map": "/.well-known/service/static/static/js/6629.a4a3fb70.chunk.js.map",
     "9997.540afd6e.chunk.js.map": "/.well-known/service/static/static/js/9997.540afd6e.chunk.js.map",
     "2838.ec459fda.chunk.js.map": "/.well-known/service/static/static/js/2838.ec459fda.chunk.js.map",
     "3953.ddf8be86.chunk.js.map": "/.well-known/service/static/static/js/3953.ddf8be86.chunk.js.map",
@@ -216,6 +216,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.36b0deea.js"
+    "static/js/main.6f9907fb.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.36b0deea.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.6f9907fb.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>