@blocklet/sdk 1.16.30-beta-958ae719 → 1.16.30-beta-b80c7bcd

package/lib/component/index.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="node" />
 import { AxiosResponse, Method } from 'axios';
 import { IncomingMessage } from 'http';
-import * as Util from './util';
 import type { Resource } from './util';
 declare const getComponentWebEndpoint: (keyword: string) => string;
 type CallComponentOptions<D = any, P = any> = {
@@ -32,7 +30,7 @@ declare const getReleaseExportDir: ({ projectId, releaseId }: {
     releaseId?: string;
 }) => string;
 declare const getResources: ({ scope, types, skipRunningCheck, }?: {
-    scope?: 'all' | 'pack' | 'excludePack';
+    scope?: "all" | "pack" | "excludePack";
     did?: string;
     types?: {
         did: string;
@@ -78,12 +76,12 @@ declare const _default: {
             type: string;
         }[];
         skipRunningCheck?: boolean;
-    }) => Util.Resource[];
+    }) => Resource[];
     getPackResources: ({ types, }?: {
         types?: {
             did: string;
             type: string;
         }[];
-    }) => Util.Resource[];
+    }) => Resource[];
 };
 export default _default;

package/lib/component/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResources = void 0;
+exports.getResources = getResources;
 const path_1 = __importDefault(require("path"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const constant_1 = require("@blocklet/constant");
@@ -54,7 +54,6 @@ function getResources({ scope, components: allComponents, types, skipRunningChec
     });
     return list;
 }
-exports.getResources = getResources;
 exports.default = {
     getResources,
 };

package/lib/config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { TComponentInternalInfo } from '@blocklet/meta/lib/blocklet';
 declare const events: EventEmitter<[never]>;

package/lib/config.js

@@ -40,6 +40,7 @@ const AppConfigKeyMap = {
     BLOCKLET_APP_URL: 'appUrl',
     BLOCKLET_APP_SPACE_ENDPOINT: 'appStorageEndpoint',
     BLOCKLET_APP_LANGUAGES: ['languages', util_1.getBlockletLanguages],
+    BLOCKLET_APP_TENANT_MODE: 'tenantMode',
     ABT_NODE_VERSION: 'serverVersion',
     ABT_NODE: 'serverVersion', // for backup compatibility
 };
@@ -146,8 +147,10 @@ const _setUpdatedComponents = (components) => {
     return list;
 };
 const _handleComponentStarted = (data) => {
+    logger.debug('_handleComponentStarted.before', data.components, componentStore);
     const list = _setComponentStatus(data.components, constant_1.BlockletStatus.running);
     events.emit(Events.componentStarted, list);
+    logger.debug('_handleComponentStarted.after', componentStore);
 };
 exports._handleComponentStarted = _handleComponentStarted;
 const _handleComponentStopped = (data) => {
@@ -168,8 +171,10 @@ const _handleComponentUpdated = (data) => {
 };
 exports._handleComponentUpdated = _handleComponentUpdated;
 const _handleComponentInstalled = (data) => {
+    logger.debug('_handleComponentInstalled.before', data.components, componentStore);
     const list = _setUpdatedComponents(data.components);
     events.emit(Events.componentAdded, list);
+    logger.debug('_handleComponentInstalled.after', componentStore);
 };
 exports._handleComponentInstalled = _handleComponentInstalled;
 const _handleConfigUpdate = (data) => {

package/lib/did.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWalletDid = exports.getWallet = exports.getPermanentDid = exports.getConnectedDids = exports.getConnectedAccounts = exports.toBlockletDid = exports.getUserInfo = void 0;
+exports.getWalletDid = exports.getWallet = exports.getPermanentDid = exports.getConnectedDids = exports.getConnectedAccounts = exports.toBlockletDid = void 0;
+exports.getUserInfo = getUserInfo;
 const did_1 = __importDefault(require("@blocklet/meta/lib/did"));
 exports.toBlockletDid = did_1.default;
 const did_utils_1 = require("@blocklet/meta/lib/did-utils");
@@ -23,4 +24,3 @@ async function getUserInfo(userDid, { authClient = undefined } = {}) {
     });
     return user;
 }
-exports.getUserInfo = getUserInfo;

package/lib/embed/generate.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = generateBlockletEmbed;
 function safeJsonParse(input, defaultValue) {
     try {
         return JSON.parse(input);
@@ -27,4 +28,3 @@ function generateBlockletEmbed() {
         embed: [],
     };
 }
-exports.default = generateBlockletEmbed;

package/lib/embed/get-embed-url.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const slim_1 = require("cheerio/lib/slim");
+exports.default = getEmbedUrlFromUrl;
+const cheerio_1 = require("cheerio");
 const ufo_1 = require("ufo");
 const axios_1 = __importDefault(require("axios"));
 /**
@@ -12,7 +13,7 @@ const axios_1 = __importDefault(require("axios"));
  * @returns boolean
  */
 function checkViteDev(htmlContent) {
-    const $ = (0, slim_1.load)(htmlContent);
+    const $ = (0, cheerio_1.load)(htmlContent);
     const scriptList = $('script[type="module"]');
     return !![...scriptList].find((scriptItem) => {
         if (scriptItem.firstChild?.type === 'text') {
@@ -30,7 +31,7 @@ async function getEmbedUrlFromUrl(url) {
         });
         let prefix = '/';
         let metaUrl = url;
-        const $ = (0, slim_1.load)(htmlContent);
+        const $ = (0, cheerio_1.load)(htmlContent);
         const link = $('link[rel="blocklet-open-embed"]');
         const blockletScript = $('script[src="__blocklet__.js"]');
         if (link && link.length > 0) {
@@ -52,4 +53,3 @@ async function getEmbedUrlFromUrl(url) {
         return url;
     }
 }
-exports.default = getEmbedUrlFromUrl;

package/lib/embed/get-embed.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getBlockletEmbedFromUrl;
 const path_1 = require("path");
 const lodash_1 = require("lodash");
 const axios_1 = __importDefault(require("axios"));
@@ -29,4 +30,3 @@ async function getBlockletEmbedFromUrl(url) {
     }
     return null;
 }
-exports.default = getBlockletEmbedFromUrl;

package/lib/embed/message.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Message = exports.useMessage = void 0;
+exports.Message = void 0;
+exports.useMessage = useMessage;
 const INIT = '__init';
 const ON_INIT = '__on-init';
 function checkKey(typeKey) {
@@ -127,7 +128,6 @@ function useMessage(id, type = 'client') {
     messageCache.set(_id, data);
     return data;
 }
-exports.useMessage = useMessage;
 exports.default = {
     useMessage,
     Message,

package/lib/middlewares/component.d.ts

@@ -2,6 +2,6 @@ import { NextFunction, Request, Response } from 'express';
 declare const verifySig: (req: Request, res: Response, next: NextFunction) => void | Response<any, Record<string, any>>;
 export { verifySig };
 declare const _default: {
-    verifySig: (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: NextFunction) => void | Response<any, Record<string, any>>;
+    verifySig: (req: Request, res: Response, next: NextFunction) => void | Response<any, Record<string, any>>;
 };
 export default _default;

package/lib/middlewares/index.d.ts

@@ -9,32 +9,32 @@ export { component };
 export { fallback };
 export { sitemap };
 declare const _default: {
-    user: () => (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> & {
+    user: () => (req: import("express").Request & {
         user?: {
             did: string;
-            role: string;
+            role: string | undefined;
             provider: string;
             fullName: string;
             walletOS: string;
         };
-    }, res: import("express").Response<any, Record<string, any>>, next: import("express").NextFunction) => void;
+    }, res: import("express").Response, next: import("express").NextFunction) => void;
     auth: ({ roles, permissions, getClient }?: {
         roles?: string[];
         permissions?: string[];
         getClient?: Function;
-    }) => (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: import("express").Response<any, Record<string, any>>, next: import("express").NextFunction) => Promise<void>;
+    }) => (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;
     component: {
-        verifySig: (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: import("express").Response<any, Record<string, any>>, next: import("express").NextFunction) => void | import("express").Response<any, Record<string, any>>;
+        verifySig: (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => void | import("express").Response<any, Record<string, any>>;
     };
     fallback: (file: string, options?: {
-        root?: string;
-        getPageData?: (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>) => Promise<{
+        root?: string | undefined;
+        getPageData?: (req: import("express").Request) => Promise<{
             title?: string;
             description?: string;
             ogImage?: string;
             embed?: string;
         }>;
-    }) => (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: import("express").Response<any, Record<string, any>>, next: import("express").NextFunction) => Promise<void>;
+    }) => (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;
     sitemap: (generatorFn: (fn: (item: {
         url: string;
         img?: {
@@ -68,6 +68,6 @@ declare const _default: {
             keywords: string;
             stock_tickers: string;
         };
-    }) => void, req?: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>) => Promise<void>) => (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: import("express").Response<any, Record<string, any>>) => Promise<void>;
+    }) => void, req?: import("express").Request) => Promise<void>) => (req: import("express").Request, res: import("express").Response) => Promise<void>;
 };
 export default _default;

package/lib/service/notification.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'node:events';
 import { TNotification, TNotificationInput, TSendOptions } from '../types/notification';
 type $TSFixMe = any;
@@ -40,10 +39,10 @@ declare const _default: {
     sendToRelay: (topic: string, event: string, data: any) => Promise<any>;
     sendToMail: (receiver: string | string[], notification: TNotification, options?: TSendOptions) => Promise<any>;
     broadcast: (notification: TNotificationInput, options?: TSendOptions) => Promise<any>;
-    on: (event: string, cb?: any) => EventEmitter<[never]>;
+    on: (event: string, cb?: $TSFixMe) => EventEmitter<[never]>;
     off: any;
     _message: {
-        on: (event: string, cb: any) => EventEmitter<[never]>;
+        on: (event: string, cb: $TSFixMe) => EventEmitter<[never]>;
         off: any;
     };
 };

package/lib/service/notification.js

@@ -164,10 +164,7 @@ const initClient = () => {
                 if (status === 'ok') {
                     const { data, sender, time } = response;
                     // eslint-disable-next-line no-console
-                    console.log(`Received event from component channel: ${event}. time: ${time}`);
-                    if (event === constant_1.BlockletInternalEvents.componentsUpdated) {
-                        return;
-                    }
+                    console.info(`Received event from component channel: ${event}. time: ${time}`);
                     if (!time || new Date(time).getTime() < new Date(process.env.BLOCKLET_START_AT).getTime()) {
                         return;
                     }
@@ -183,10 +180,7 @@ const initClient = () => {
                 }
                 else {
                     emitError(response);
-                    console.error({
-                        status,
-                        response,
-                    });
+                    console.error({ status, response });
                 }
             });
         });
@@ -196,10 +190,7 @@ const initClient = () => {
             }
             else {
                 emitter.emit('error', response);
-                console.error({
-                    status,
-                    response,
-                });
+                console.error({ status, response });
             }
         });
     }

package/lib/util/app-info.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMemberAppInfo = exports.getAppInfo = exports.getFederatedMasterAppInfo = void 0;
+exports.getFederatedMasterAppInfo = getFederatedMasterAppInfo;
+exports.getAppInfo = getAppInfo;
+exports.getMemberAppInfo = getMemberAppInfo;
 const ufo_1 = require("ufo");
 const util_1 = require("@blocklet/meta/lib/util");
 const info_1 = __importDefault(require("@blocklet/meta/lib/info"));
@@ -22,7 +24,6 @@ function getFederatedMasterAppInfo({ blocklet, sourceAppPid, version, groupPathP
         nodeDid: nodeInfo.did,
     };
 }
-exports.getFederatedMasterAppInfo = getFederatedMasterAppInfo;
 async function getAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }) {
     const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
     const [blocklet, info] = await Promise.all([getBlocklet(), getNodeInfo()]);
@@ -51,7 +52,6 @@ async function getAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }) {
         // NOTE: publisher 是 WalletAuthenticator 中自动添加的
     };
 }
-exports.getAppInfo = getAppInfo;
 async function getMemberAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }) {
     const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
     const [blocklet, info] = await Promise.all([getBlocklet(), getNodeInfo()]);
@@ -75,4 +75,3 @@ async function getMemberAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, })
     }
     return null;
 }
-exports.getMemberAppInfo = getMemberAppInfo;

package/lib/util/jest-setup.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = setupJest;
 // Setup blocklet environments for jest
 const os_1 = __importDefault(require("os"));
 const fs_1 = __importDefault(require("fs"));
@@ -53,4 +54,3 @@ function setupJest() {
         console.error('Failed to setup blocklet environment for jest', err);
     }
 }
-exports.default = setupJest;

package/lib/util/jest-teardown.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = setupJest;
 // Setup blocklet environments for jest
 const os_1 = __importDefault(require("os"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -21,4 +22,3 @@ function setupJest() {
         console.error('Failed to tear blocklet environment for jest', err);
     }
 }
-exports.default = setupJest;

package/lib/util/login.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSourceAppPid = exports.getLoginProvider = void 0;
+exports.getLoginProvider = getLoginProvider;
+exports.getSourceAppPid = getSourceAppPid;
 /* eslint-disable import/prefer-default-export */
 const constant_1 = require("@blocklet/constant");
 function getLoginProvider(request) {
     const extraParams = request?.context?.store?.extraParams || request.query || {};
     return extraParams.provider || constant_1.LOGIN_PROVIDER.WALLET;
 }
-exports.getLoginProvider = getLoginProvider;
 function getSourceAppPid(request) {
     const extraParams = request?.context?.store?.extraParams || request.query || {};
     return extraParams?.sourceAppPid || null;
 }
-exports.getSourceAppPid = getSourceAppPid;

package/lib/util/send-notification.d.ts

@@ -18,7 +18,7 @@ export type TNotificationSender = {
 declare const sendToUser: (receiver: string | string[], notification: TNotification | TNotificationInput, { appDid, appSk, type }: TNotificationSender, port?: string, options?: {
     keepForOfflineUser?: boolean;
     locale?: string;
-    channels?: ('app' | 'email' | 'push' | 'webhook')[];
+    channels?: ("app" | "email" | "push" | "webhook")[];
 }, pathname?: string) => Promise<any>;
 declare const sendToAppChannel: (channel: string, event: string, notification: TNotificationInput, { appDid, appSk }: TNotificationSender, port?: string, options?: TSendOptions) => Promise<any>;
 declare const sendToRelay: (topic: string, event: string, data: any, { appDid, appSk }: TNotificationSender, port?: string) => Promise<any>;
@@ -27,7 +27,7 @@ declare const _default: {
     sendToUser: (receiver: string | string[], notification: TNotification | TNotificationInput, { appDid, appSk, type }: TNotificationSender, port?: string, options?: {
         keepForOfflineUser?: boolean;
         locale?: string;
-        channels?: ("push" | "app" | "email" | "webhook")[];
+        channels?: ("app" | "email" | "push" | "webhook")[];
     }, pathname?: string) => Promise<any>;
     sendToAppChannel: (channel: string, event: string, notification: TNotificationInput, { appDid, appSk }: TNotificationSender, port?: string, options?: TSendOptions) => Promise<any>;
     sendToRelay: (topic: string, event: string, data: any, { appDid, appSk }: TNotificationSender, port?: string) => Promise<any>;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.30-beta-958ae719",
+  "version": "1.16.30-beta-b80c7bcd",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,15 +27,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.30-beta-958ae719",
-    "@abtnode/constant": "1.16.30-beta-958ae719",
+    "@abtnode/client": "1.16.30-beta-b80c7bcd",
+    "@abtnode/constant": "1.16.30-beta-b80c7bcd",
     "@arcblock/did": "1.18.128",
     "@arcblock/did-auth": "1.18.128",
     "@arcblock/jwt": "1.18.128",
     "@arcblock/ws": "1.18.128",
-    "@blocklet/constant": "1.16.30-beta-958ae719",
-    "@blocklet/env": "1.16.30-beta-958ae719",
-    "@blocklet/meta": "1.16.30-beta-958ae719",
+    "@blocklet/constant": "1.16.30-beta-b80c7bcd",
+    "@blocklet/env": "1.16.30-beta-b80c7bcd",
+    "@blocklet/meta": "1.16.30-beta-b80c7bcd",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
@@ -75,5 +75,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "75590ff3be51e7fe2a070124541aebc203ed16dc"
+  "gitHead": "9d68833290b1a59357b7c362018416b82b5d1503"
 }