@abtnode/blocklet-services 1.16.38-beta-20250123-083218-c7ea9693 → 1.16.38-beta-20250126-132712-f36c6a8b

package/api/index.js

@@ -25,8 +25,8 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const createInvite = require('@abtnode/auth/lib/invitation');
 const { getStatusFromError } = require('@abtnode/util/lib/custom-error');
 const { withQuery, joinURL, withTrailingSlash } = require('ufo');
-const { createProxyMiddleware } = require('http-proxy-middleware');
-const { findComponentByIdV2 } = require('@blocklet/meta/lib/util');
+const { createProxyMiddleware, responseInterceptor } = require('http-proxy-middleware');
+const { findComponentByIdV2, getMountPoints } = require('@blocklet/meta/lib/util');
 const {
   patchResponseHeader,
   DEFAULT_HELMET_CONFIG,
@@ -344,24 +344,119 @@ module.exports = function createServer(node, serverOptions = {}) {
   });
 
   // 提供统一的 service-worker 注册入口，优先采用 service 自己提供的逻辑，尽量不依赖 Nginx 配置
-  server.use(/.*\/__service-worker__\.js$/, ensureBlocklet(), (req, res, next) => {
-    const { blocklet } = req;
-    const componentId = req.headers['x-blocklet-component-id'];
-    const appUrl = blocklet.environmentObj?.BLOCKLET_APP_URL;
-    const component = findComponentByIdV2(blocklet, componentId);
-    res.set('Service-Worker-Allowed', withTrailingSlash(component.mountPoint));
-    const realSwUrl = withQuery(joinURL('/.blocklet/proxy', componentId.split('/').pop(), 'service-worker.js'), {
-      // 确保获取到的 sw 是最新的
-      d: Date.now(),
-    });
-    const proxySw = createProxyMiddleware({
-      target: appUrl,
-      pathRewrite: () => realSwUrl,
-      changeOrigin: true,
-    });
+  server.use(
+    [
+      // DEPRECATED: @zhanghan 后续统一使用 __sw__ 地址
+      /.*\/__service-worker__\.js$/,
+      /.*\/__sw__\.js$/,
+    ],
+    ensureBlocklet(),
+    (req, res, next) => {
+      const { blocklet } = req;
+      const componentId = req.headers['x-blocklet-component-id'];
+      if (!componentId) {
+        logger.warn('Missing x-blocklet-component-id header', { url: req.url });
+        res.type('js').send('');
+        return;
+      }
+      const componentDid = componentId.split('/').pop();
+      const appUrl = blocklet.environmentObj?.BLOCKLET_APP_URL;
+      const component = findComponentByIdV2(blocklet, componentId);
+      res.set('Service-Worker-Allowed', withTrailingSlash(component.mountPoint));
+      const realSwUrl = withQuery(joinURL('/.blocklet/proxy', componentDid, 'service-worker.js'), {
+        // 确保获取到的 sw 是最新的
+        d: Date.now(),
+      });
+      const scope = withTrailingSlash(component.mountPoint);
 
-    return proxySw(req, res, next);
-  });
+      const componentMountPoints = getMountPoints(blocklet);
+      const sharedComponents = (blocklet?.children || []).filter((child) => {
+        const enabledShared = child?.configs?.find((x) => {
+          if (x.key === 'SERVICE_WORKER_SHARING_ENABLED' && x.value === 'true') {
+            return true;
+          }
+          return false;
+        });
+        return !!enabledShared;
+      });
+      const mountPoints = componentMountPoints.map((x) => withTrailingSlash(x.mountPoint));
+      const sharedMountPoints = sharedComponents.map((x) => withTrailingSlash(x.mountPoint));
+      const customContent = `importScripts('/.well-known/service/static/share/workbox-v7.3.0/workbox-sw.js');
+workbox.setConfig({
+  modulePathPrefix: '/.well-known/service/static/share/workbox-v7.3.0/',
+});
+
+self.blocklet = {
+  workbox,
+  did: '${componentDid}',
+  prefix: '${scope}',
+  mountPoints: ${JSON.stringify(mountPoints)},
+  sharedMountPoints: ${JSON.stringify(sharedMountPoints)},
+  whiteList: [
+    '/favicon.ico',
+    '/.well-known/service/blocklet/logo',
+    '/.well-known/service/blocklet/logo-favicon',
+    '/.well-known/service/blocklet/logo-rect',
+    '/.well-known/service/blocklet/splash/portrait',
+    '/.well-known/service/blocklet/splash/landscape',
+    '/.well-known/service/openembed.json',
+    '/.well-known/service/openembed.yaml',
+  ],
+  canCache({ url }) {
+    const pathname = url.pathname;
+    if (pathname.startsWith('/.well-known/analytics')) {
+      return false;
+    }
+    if (
+      pathname.startsWith('/.well-known/service/static/share/') ||
+      pathname.startsWith('/.blocklet/proxy/'+self.blocklet.did) ||
+      self.blocklet.whiteList.some((x) => x === url.pathname)
+    ) {
+      return true;
+    }
+
+    if (self.blocklet.sharedMountPoints.some((x) => pathname.startsWith(x))) {
+      return true;
+    }
+
+    const otherMountPoints = self.blocklet.mountPoints.filter((item) => item !== self.blocklet.prefix);
+    if (self.blocklet.prefix === '/') {
+      if (!otherMountPoints.some((x) => pathname.startsWith(x)) && !pathname.startsWith('/.well-known/service/')) {
+        return true;
+      }
+      return false;
+    }
+    if (pathname.startsWith(self.blocklet.prefix)) {
+      return true;
+    }
+    return false;
+  },
+  fixRouteUrl(route) {
+    return {
+      ...route,
+      url: '/.blocklet/proxy/'+self.blocklet.did+'/'+route.url,
+    };
+  },
+};`;
+      const proxySw = createProxyMiddleware({
+        target: appUrl,
+        pathRewrite: () => realSwUrl,
+        changeOrigin: true,
+        selfHandleResponse: true,
+        on: {
+          proxyRes: responseInterceptor((responseBuffer) => {
+            if (!responseBuffer) {
+              return customContent;
+            }
+            const response = responseBuffer.toString('utf8');
+            return [customContent, response].join('\n');
+          }),
+        },
+      });
+
+      proxySw(req, res, next);
+    }
+  );
 
   // 此处逻辑会为 service 和 blocklet 都增加安全相关的 header 配置
   server.use(async (req, res, next) => {
@@ -404,6 +499,8 @@ module.exports = function createServer(node, serverOptions = {}) {
   notificationService.sendToUser.attach(server);
   notificationService.sendToMail.attach(server);
   notificationService.sendToPush.attach(server);
+  notificationService.sendToApp.attach(server);
+  notificationService.sendToWebhook.attach(server);
   notificationService.sendToAppChannel.attach(server);
   relayService.sendToRelay.attach(server);
 

package/api/services/dashboard/index.js

@@ -123,6 +123,15 @@ function createWebsocketServer(node, ensureWsUser) {
     }
   });
 
+  // 发送给 admin
+  eventHub.on(EVENTS.NOTIFICATION_BLOCKLET_CREATE, (data) => {
+    if (data?.entityType === 'blocklet' && data.entityId) {
+      const did = data.entityId;
+      const eventName = `${did}/${EVENTS.NOTIFICATION_BLOCKLET_CREATE}`;
+      wsServer.broadcast(eventName, eventName, data, { noCluster: true });
+    }
+  });
+
   const streamLogManager = commonListen(wsServer, node);
 
   eventHub.on(BlockletEvents.removed, (data) => {
@@ -184,6 +193,7 @@ function createNotificationWebsocketServer(node, ensureWsUser) {
     },
   });
 
+  // 发送给用户
   eventHub.on(EVENTS.NOTIFICATION_BLOCKLET_CREATE, (data) => {
     if (data?.entityType === 'blocklet' && data.entityId) {
       const did = data.entityId;

package/api/services/notification/index.js

@@ -8,7 +8,7 @@ const states = require('../../state');
 const logger = require('../../libs/logger')('notification');
 const { sendToAppChannel } = require('../../socket/channel/app');
 const { sendToAppComponents } = require('../../socket/channel/component');
-const { sendToUserDid, sendToAppDid, sendToMail, sendToPush } = require('../../socket/channel/did');
+const { sendToUserDid, sendToAppDid, sendToMail, sendToPush, sendToWebhook } = require('../../socket/channel/did');
 const getHooksByChannel = require('../../socket/channel/hooks');
 const { getTokenInfo } = require('../../socket/util');
 
@@ -143,6 +143,28 @@ const init = ({ node }) => {
     }
   };
 
+  const onSendToWebhook = async (req, res) => {
+    try {
+      const results = await sendToWebhook({ ...req.body.data, node });
+      res.status(200).json(results);
+    } catch (error) {
+      logger.error('Send webhook failed', { error });
+      res.statusMessage = error.message;
+      res.status(400).send(error.message);
+    }
+  };
+
+  const onSendToWallet = async (req, res) => {
+    try {
+      await sendToAppDid({ ...req.body.data, node, wsServer });
+      res.status(200).send('');
+    } catch (error) {
+      logger.error('Send message to app channel failed', { error });
+      res.statusMessage = error.message;
+      res.status(400).send(error.message);
+    }
+  };
+
   const onSendToAppChannel = async (req, res) => {
     try {
       await sendToAppChannel({ ...req.body.data, node, wsServer });
@@ -177,7 +199,16 @@ const init = ({ node }) => {
       exec: (data) => sendToMail({ ...data, node, wsServer }),
     },
 
+    sendToWebhook: {
+      attach: (app) => {
+        app.post(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/send-to-webhook`, onSendToWebhook);
+      },
+    },
+
     sendToApp: {
+      attach: (app) => {
+        app.post(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/send-to-wallet`, onSendToWallet);
+      },
       exec: ({ event, appDid, data }) => sendToAppDid({ event, appDid, data, node, wsServer }),
     },