@blocklet/sdk 1.16.52-beta-20251005-235515-42ad5caf → 1.16.52-beta-20251008-094601-8a853b5b

package/lib/config.d.ts

@@ -41,6 +41,7 @@ declare const env: {
     appStorageEndpoint: string;
     serverVersion: string;
     sessionSalt: string;
+    assetCdnHost: string;
     languages: {
         code: string;
         name: string;
@@ -123,6 +124,7 @@ declare const _default: {
         appStorageEndpoint: string;
         serverVersion: string;
         sessionSalt: string;
+        assetCdnHost: string;
         languages: {
             code: string;
             name: string;

package/lib/config.js

@@ -51,6 +51,7 @@ const AppConfigKeyMap = {
     BLOCKLET_APP_SALT: 'sessionSalt',
     ABT_NODE_VERSION: 'serverVersion',
     ABT_NODE: 'serverVersion', // for backup compatibility
+    ASSET_CDN_HOST: 'assetCdnHost',
 };
 // eslint-disable-next-line import/no-mutable-exports
 let logger = {
@@ -109,6 +110,7 @@ const env = {
     mode: process.env.BLOCKLET_MODE,
     tenantMode: process.env.BLOCKLET_APP_TENANT_MODE,
     sessionSalt: process.env.BLOCKLET_APP_SALT || '',
+    assetCdnHost: process.env.ASSET_CDN_HOST,
     preferences: {
         ...env_1.default.preferences,
         ...appEnvFromDisk.preferences,
@@ -393,7 +395,7 @@ if (inRuntimeEnv && !process.env.BLOCKLET_HOOK_NAME && process.env.BLOCKLET_MODE
     notification_1.default.on(constant_1.BlockletInternalEvents.componentInstalled, runInServer(_handleComponentInstalled, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentUpgraded, runInServer(_handleComponentUpdated, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentUpdated, runInServer(_handleComponentUpdated, 'new'));
-    notification_1.default.on(constant_1.BlockletInternalEvents.componentStarted, runInServer(_handleComponentStarted, 'new'));
+    notification_1.default.on(constant_1.BlockletInternalEvents.componentStarted, runInServer(_handleComponentUpdated, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentStopped, runInServer(_handleComponentStopped, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentRemoved, runInServer(_handleComponentRemoved, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentInstalled, runInServer(refreshBlockletContext, 'new'));

package/lib/middlewares/cdn.d.ts

@@ -1,16 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
-export declare class BlockletAssetHostTransformer {
-    private static readonly HTML_TAG_INDICATOR;
-    private static readonly BLOCKLET_PROXY_PREFIX;
-    private readonly assetBase;
-    private readonly quotedAssetBase;
-    private readonly quotedAssetBasePattern;
-    constructor(did: string);
-    private static escapeForRegex;
-    private static normalizeAssetHost;
-    static containsHtmlMarkup(payload: string): boolean;
-    transform(html: string, assetHost: string): string;
-    transformBuffer(body: Buffer, assetHost: string): Buffer<ArrayBufferLike>;
+export interface CdnOptions {
+    did?: string;
+    getAssetCdnHost?: () => string;
 }
-export declare const createTransformAssetHostMiddleware: (did: string) => (req: Request, res: Response, next: NextFunction) => void;
-export declare const cdn: (req: Request, res: Response, next: NextFunction) => void;
+export declare const cdn: ({ did, getAssetCdnHost }?: CdnOptions) => (req: Request, res: Response, next: NextFunction) => void;

package/lib/middlewares/cdn.js

@@ -1,55 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cdn = exports.createTransformAssetHostMiddleware = exports.BlockletAssetHostTransformer = void 0;
+exports.cdn = void 0;
 const constant_1 = require("@blocklet/constant");
-class BlockletAssetHostTransformer {
-    constructor(did) {
-        this.assetBase = `${BlockletAssetHostTransformer.BLOCKLET_PROXY_PREFIX}${did}/`;
-        this.quotedAssetBase = `"${this.assetBase}`;
-        this.quotedAssetBasePattern = new RegExp(BlockletAssetHostTransformer.escapeForRegex(this.quotedAssetBase), 'g');
-    }
-    static escapeForRegex(value) {
-        const pattern = /[.*+?^${}()|[\]\\]/g;
-        return value.replace(pattern, '\\$&');
-    }
-    static normalizeAssetHost(assetHost) {
-        if (!assetHost) {
-            return null;
-        }
-        const trimmed = assetHost.trim();
-        if (!trimmed) {
-            return null;
-        }
-        return trimmed.replace(/\/+$/, '').replace(/^https?:\/\//, '');
-    }
-    static containsHtmlMarkup(payload) {
-        return payload.includes(BlockletAssetHostTransformer.HTML_TAG_INDICATOR);
-    }
-    transform(html, assetHost) {
-        const host = BlockletAssetHostTransformer.normalizeAssetHost(assetHost);
-        if (!host) {
-            return html;
-        }
-        if (!BlockletAssetHostTransformer.containsHtmlMarkup(html)) {
-            return html;
-        }
-        return html.replace(this.quotedAssetBasePattern, `"//${host}${this.assetBase}`);
-    }
-    transformBuffer(body, assetHost) {
-        const bodyAsString = body.toString('utf8');
-        if (!BlockletAssetHostTransformer.containsHtmlMarkup(bodyAsString)) {
-            return body;
-        }
-        const transformed = this.transform(bodyAsString, assetHost);
-        if (transformed === bodyAsString) {
-            return body;
-        }
-        return Buffer.from(transformed);
-    }
-}
-exports.BlockletAssetHostTransformer = BlockletAssetHostTransformer;
-BlockletAssetHostTransformer.HTML_TAG_INDICATOR = '<html';
-BlockletAssetHostTransformer.BLOCKLET_PROXY_PREFIX = '/.blocklet/proxy/';
+const config_1 = require("../config");
+const asset_host_transformer_1 = require("../util/asset-host-transformer");
 function shouldProcessRequest(req) {
     const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NODE_SERVICE_ENV === 'production';
     if (!isProduction) {
@@ -67,10 +21,13 @@ function shouldProcessRequest(req) {
     const accepted = req.accepts(['html', 'text/html', 'application/xhtml+xml', '*/*']);
     return Boolean(accepted);
 }
-const createTransformAssetHostMiddleware = (did) => {
-    const transformer = new BlockletAssetHostTransformer(did);
+const cdn = ({ did = config_1.env.componentDid, getAssetCdnHost } = {}) => {
+    if (!did) {
+        throw new Error('did is required');
+    }
+    const transformer = new asset_host_transformer_1.AssetHostTransformer(`/.blocklet/proxy/${did}/`);
     return (req, res, next) => {
-        const assetHost = process.env.ASSET_CDN_HOST;
+        const assetHost = getAssetCdnHost ? getAssetCdnHost() : config_1.env.assetCdnHost;
         if (!shouldProcessRequest(req) || !assetHost) {
             next();
             return;
@@ -88,5 +45,4 @@ const createTransformAssetHostMiddleware = (did) => {
         next();
     };
 };
-exports.createTransformAssetHostMiddleware = createTransformAssetHostMiddleware;
-exports.cdn = (0, exports.createTransformAssetHostMiddleware)(process.env.BLOCKLET_COMPONENT_DID);
+exports.cdn = cdn;

package/lib/middlewares/index.d.ts

@@ -88,6 +88,6 @@ declare const _default: {
     }) => (req: import("express").Request & {
         user?: import("../util/login").SessionUser;
     }, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;
-    cdn: (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => void;
+    cdn: ({ did, getAssetCdnHost }?: import("./cdn").CdnOptions) => (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => void;
 };
 export default _default;

package/lib/service/blocklet.d.ts

@@ -3,7 +3,7 @@ import { LOGIN_PROVIDER } from '@blocklet/constant';
 type PartialDeep<T> = {
     [K in keyof T]?: T[K] extends object ? PartialDeep<T[K]> : T[K];
 };
-type OmitTeamDid<T> = PartialDeep<Omit<T, 'teamDid'>>;
+type OmitTeamDid<T> = PartialDeep<Omit<T, 'teamDid' | 'did'>>;
 type RequestHeaders = {
     headers: {
         cookie: string;
@@ -90,5 +90,7 @@ interface BlockletService {
     getOrgResource(params: OmitTeamDid<Client.RequestGetOrgResourceInput>): Promise<Client.ResponseGetOrgResource>;
     addOrgResource(params: OmitTeamDid<Client.RequestAddOrgResourceInput>): Promise<Client.ResponseOrgResourceOperation>;
     migrateOrgResource(params: OmitTeamDid<Client.RequestMigrateOrgResourceInput>): Promise<Client.ResponseOrgResourceOperation>;
+    configBlocklet(params: OmitTeamDid<Client.RequestConfigBlockletInput>): Promise<Client.ResponseBlocklet>;
+    configNavigations(params: OmitTeamDid<Client.RequestConfigNavigationsInput>): Promise<Client.ResponseBlocklet>;
 }
 export = BlockletService;

package/lib/service/blocklet.js

@@ -173,6 +173,9 @@ class BlockletService {
             'getOrgResource',
             'addOrgResource',
             'migrateOrgResource',
+            // config
+            'configBlocklet',
+            'configNavigations',
         ];
         const teamDid = process.env.BLOCKLET_DID;
         const componentDid = process.env.BLOCKLET_COMPONENT_DID;
@@ -207,17 +210,19 @@ class BlockletService {
             getBlocklet: (fn) => (attachRuntimeInfo = false, useCache = true) => fn({ input: { did: teamDid, attachRuntimeInfo, useCache } }, { ignoreFields: ['blocklet.settings.navigations'] }),
             createAccessKey: (fn) => (params) => fn({
                 input: {
-                    teamDid,
                     authType: 'simple',
                     createdVia: 'sdk',
                     passport: constant_1.SERVER_ROLES.GUEST,
                     ...params,
                     componentDid,
+                    teamDid,
                 },
             }),
-            verifyAccessKey: (fn) => (params) => fn({ input: { teamDid, ...params } }),
-            getAccessKeys: (fn) => (params) => fn({ input: { teamDid, ...params, componentDid } }),
-            getAccessKey: (fn) => (params) => fn({ input: { teamDid, ...params } }),
+            verifyAccessKey: (fn) => (params) => fn({ input: { ...params, teamDid } }),
+            getAccessKeys: (fn) => (params) => fn({ input: { ...params, teamDid, componentDid } }),
+            getAccessKey: (fn) => (params) => fn({ input: { ...params, teamDid } }),
+            configBlocklet: (fn) => (params) => fn({ input: { ...params, did: [teamDid] } }),
+            configNavigations: (fn) => (params) => fn({ input: { ...params, did: [teamDid] } }),
         };
         apiList.forEach((api) => {
             const fn = client[api];

package/lib/util/asset-host-transformer.d.ts

@@ -0,0 +1,11 @@
+export declare class AssetHostTransformer {
+    private static readonly HTML_TAG_INDICATOR;
+    private readonly assetBase;
+    private readonly quotedAssetBasePattern;
+    constructor(assetBase: string);
+    private static escapeForRegex;
+    private static normalizeAssetHost;
+    static containsHtmlMarkup(payload: string): boolean;
+    transform(html: string, assetHost: string): string;
+    transformBuffer(body: Buffer, assetHost: string): Buffer<ArrayBufferLike>;
+}

package/lib/util/asset-host-transformer.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssetHostTransformer = void 0;
+const ufo_1 = require("ufo");
+class AssetHostTransformer {
+    constructor(assetBase) {
+        this.assetBase = (0, ufo_1.withLeadingSlash)((0, ufo_1.withTrailingSlash)(assetBase));
+        this.quotedAssetBasePattern = new RegExp(AssetHostTransformer.escapeForRegex(`"${this.assetBase}`), 'g');
+    }
+    static escapeForRegex(value) {
+        const pattern = /[.*+?^${}()|[\]\\]/g;
+        return value.replace(pattern, '\\$&');
+    }
+    static normalizeAssetHost(assetHost) {
+        if (!assetHost) {
+            return null;
+        }
+        const trimmed = assetHost.trim();
+        if (!trimmed) {
+            return null;
+        }
+        return trimmed.replace(/\/+$/, '').replace(/^https?:\/\//, '');
+    }
+    static containsHtmlMarkup(payload) {
+        return payload.includes(AssetHostTransformer.HTML_TAG_INDICATOR);
+    }
+    transform(html, assetHost) {
+        const host = AssetHostTransformer.normalizeAssetHost(assetHost);
+        if (!host) {
+            return html;
+        }
+        if (!AssetHostTransformer.containsHtmlMarkup(html)) {
+            return html;
+        }
+        return html.replace(this.quotedAssetBasePattern, `"//${host}${this.assetBase}`);
+    }
+    transformBuffer(body, assetHost) {
+        const bodyAsString = body.toString('utf8');
+        if (!AssetHostTransformer.containsHtmlMarkup(bodyAsString)) {
+            return body;
+        }
+        const transformed = this.transform(bodyAsString, assetHost);
+        if (transformed === bodyAsString) {
+            return body;
+        }
+        return Buffer.from(transformed);
+    }
+}
+exports.AssetHostTransformer = AssetHostTransformer;
+AssetHostTransformer.HTML_TAG_INDICATOR = '<html';

package/lib/util/verify-session.js

@@ -35,8 +35,8 @@ function verifyLoginToken({ token, strictMode }) {
                 resolve(null);
                 return;
             }
-            const { did, role, fullName, provider = constant_1.LOGIN_PROVIDER.WALLET, walletOS, kyc = 0 } = decoded;
-            resolve({
+            const { did, role, fullName, provider = constant_1.LOGIN_PROVIDER.WALLET, walletOS, kyc = 0, org = '' } = decoded;
+            const loginUser = {
                 did,
                 role,
                 fullName,
@@ -44,7 +44,11 @@ function verifyLoginToken({ token, strictMode }) {
                 walletOS,
                 ...(0, login_1.decodeKycStatus)(Number(kyc) || 0),
                 method: 'loginToken',
-            });
+            };
+            if (org) {
+                loginUser.org = org;
+            }
+            resolve(loginUser);
         });
     });
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20251005-235515-42ad5caf",
+  "version": "1.16.52-beta-20251008-094601-8a853b5b",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,19 +27,19 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/db-cache": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/util": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/constant": "1.16.52-beta-20251008-094601-8a853b5b",
+    "@abtnode/db-cache": "1.16.52-beta-20251008-094601-8a853b5b",
+    "@abtnode/util": "1.16.52-beta-20251008-094601-8a853b5b",
     "@arcblock/did": "1.25.6",
     "@arcblock/did-connect-js": "1.25.6",
     "@arcblock/jwt": "1.25.6",
     "@arcblock/ws": "1.25.6",
-    "@blocklet/constant": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/env": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@blocklet/constant": "1.16.52-beta-20251008-094601-8a853b5b",
+    "@blocklet/env": "1.16.52-beta-20251008-094601-8a853b5b",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/server-js": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/theme": "^3.1.44",
+    "@blocklet/meta": "1.16.52-beta-20251008-094601-8a853b5b",
+    "@blocklet/server-js": "1.16.52-beta-20251008-094601-8a853b5b",
+    "@blocklet/theme": "^3.1.45",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
     "@nedb/core": "^2.1.5",
@@ -85,5 +85,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "7b295929a123edac2cb292c43f2edda0d3e3e6b8"
+  "gitHead": "355bb7832b143453d20acad991d728dac69fcf07"
 }