@blocklet/sdk 1.16.14-beta-a90ba909 → 1.16.14-beta-c2843ec5

package/lib/config.d.ts

@@ -45,7 +45,8 @@ declare const handleComponentUpdate: (data: {
     components: TComponents;
 }) => void;
 declare const handleConfigUpdate: (data: any) => void;
-export { logger, env, components, MountPoint, events, handleComponentUpdate, handleConfigUpdate };
+declare const getBlockletJs: (pageGroup?: string, pathPrefix?: string, source?: string) => string;
+export { logger, env, components, MountPoint, events, getBlockletJs, handleComponentUpdate, handleConfigUpdate };
 declare const _default: {
     logger: {
         info: {
@@ -87,5 +88,7 @@ declare const _default: {
         components: TComponents;
     }) => void;
     handleConfigUpdate: (data: any) => void;
+    fetchBlockletJs: () => Promise<any>;
+    getBlockletJs: (pageGroup?: string, pathPrefix?: string, source?: string) => string;
 };
 export default _default;

package/lib/config.js

@@ -3,13 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleConfigUpdate = exports.handleComponentUpdate = exports.events = exports.components = exports.env = exports.logger = void 0;
+exports.handleConfigUpdate = exports.handleComponentUpdate = exports.getBlockletJs = exports.events = exports.components = exports.env = exports.logger = void 0;
+const url_join_1 = __importDefault(require("url-join"));
 const events_1 = __importDefault(require("events"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const throttle_1 = __importDefault(require("lodash/throttle"));
 const env_1 = __importDefault(require("@blocklet/env"));
 const constant_1 = require("@blocklet/constant");
 const util_1 = require("@blocklet/env/lib/util");
 const util_2 = require("@blocklet/meta/lib/util");
+const axios_1 = __importDefault(require("./util/axios"));
+const version_1 = require("./version");
 const notification_1 = __importDefault(require("./service/notification"));
 const events = new events_1.default();
 exports.events = events;
@@ -28,7 +32,7 @@ const AppConfigKeyMap = {
 };
 const logger = {
     // eslint-disable-next-line no-console
-    info: console.log,
+    info: console.info,
     debug: (...args) => {
         if (process.env.NODE_ENV === 'development') {
             // eslint-disable-next-line no-console
@@ -83,10 +87,53 @@ const handleConfigUpdate = (data) => {
     events.emit(Events.envUpdate, updates);
 };
 exports.handleConfigUpdate = handleConfigUpdate;
+let blockletJs = '';
+const fetchBlockletJs = async () => {
+    try {
+        const componentDid = process.env.BLOCKLET_COMPONENT_DID;
+        const { mountPoint } = components.find((x) => x.did === componentDid);
+        const res = await axios_1.default.get((0, url_join_1.default)(env.appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?t=${Date.now()}`), {
+            timeout: 8000,
+            headers: {
+                'User-Agent': `BlockletSDK/${version_1.version}`,
+            },
+        });
+        blockletJs = res.data;
+        // eslint-disable-next-line no-console
+        logger.info('Fetch blocklet.js succeed', { componentDid });
+        return res.data;
+    }
+    catch (err) {
+        logger.error('Failed to fetch blocklet.js', err.message);
+        return null;
+    }
+};
+// Page group is dynamic, so we need to create it on the fly
+const normalize = (prefix) => `/${prefix}/`.replace(/\/+/g, '/');
+const getBlockletJs = (pageGroup = '', pathPrefix = '', source = blockletJs) => {
+    let copy = source;
+    if (pageGroup) {
+        copy = copy.replace('pageGroup: "",', `pageGroup: "${pageGroup}",`);
+    }
+    if (pathPrefix) {
+        const componentDid = process.env.BLOCKLET_COMPONENT_DID;
+        const { mountPoint } = components.find((x) => x.did === componentDid);
+        copy = copy.replace(`prefix: "${normalize(mountPoint)}",`, `prefix: "${normalize(pathPrefix)}",`);
+    }
+    return copy;
+};
+exports.getBlockletJs = getBlockletJs;
+const refreshBlockletJs = (0, throttle_1.default)(fetchBlockletJs, 8000);
 const inRuntimeEnv = !!process.env.BLOCKLET_APP_SK;
 if (inRuntimeEnv && !process.env.BLOCKLET_HOOK_NAME) {
     notification_1.default.on(constant_1.BlockletInternalEvents.componentsUpdated, handleComponentUpdate);
     notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, handleConfigUpdate);
+    // Reactive fetch
+    notification_1.default.on(constant_1.BlockletInternalEvents.componentsUpdated, refreshBlockletJs);
+    notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, refreshBlockletJs);
+    notification_1.default.on(constant_1.BlockletInternalEvents.appSettingChanged, refreshBlockletJs);
+    // Do an initial fetch
+    fetchBlockletJs();
 }
 exports.default = {
     logger,
@@ -95,4 +142,6 @@ exports.default = {
     events,
     handleComponentUpdate,
     handleConfigUpdate,
+    fetchBlockletJs,
+    getBlockletJs,
 };

package/lib/middlewares/fallback.d.ts

@@ -0,0 +1,8 @@
+import { NextFunction, Request, Response } from 'express';
+type FallbackOptions = {
+    cacheControl?: boolean | undefined;
+    maxAge?: string | number | undefined;
+    root?: string | undefined;
+};
+declare const fallback: (file: string, options?: FallbackOptions) => (req: Request, res: Response, next: NextFunction) => void;
+export = fallback;

package/lib/middlewares/fallback.js

@@ -0,0 +1,30 @@
+"use strict";
+const fs_1 = require("fs");
+const path_1 = require("path");
+const config_1 = require("../config");
+const fallback = (file, options = {}) => {
+    const filePath = options.root ? (0, path_1.join)(options.root, file) : file;
+    if ((0, fs_1.existsSync)(filePath) === false) {
+        throw new Error(`Fallback file not found at: ${filePath}`);
+    }
+    const source = (0, fs_1.readFileSync)(filePath).toString();
+    return (req, res, next) => {
+        if ((req.method === 'GET' || req.method === 'HEAD') && req.accepts('html')) {
+            res.type('html');
+            const pageGroup = req.headers['x-page-group'] || '';
+            const blockletJs = (0, config_1.getBlockletJs)(pageGroup);
+            if (blockletJs) {
+                res.send(source
+                    .replace('<script src="__blocklet__.js"></script>', `<script>${blockletJs}</script>`)
+                    .replace('<script src="__meta__.js"></script>', `<script>${blockletJs}</script>`));
+            }
+            else {
+                res.send(source);
+            }
+        }
+        else {
+            next();
+        }
+    };
+};
+module.exports = fallback;

package/lib/middlewares/index.d.ts

@@ -1,14 +1,17 @@
 import user from './user';
 import auth from './auth';
 import component from './component';
+import fallback from './fallback';
 export { user };
 export { auth };
 export { component };
+export { fallback };
 declare const _default: {
     user: () => (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> & {
         user?: {
             did: string;
             role: string;
+            provider: string;
             fullName: string;
         };
     }, res: import("express").Response<any, Record<string, any>>, next: import("express").NextFunction) => void;
@@ -20,5 +23,10 @@ declare const _default: {
     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>>;
     };
+    fallback: (file: string, options?: {
+        cacheControl?: boolean;
+        maxAge?: string | number;
+        root?: 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) => void;
 };
 export default _default;

package/lib/middlewares/index.js

@@ -3,15 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.component = exports.auth = exports.user = void 0;
+exports.fallback = exports.component = exports.auth = exports.user = void 0;
 const user_1 = __importDefault(require("./user"));
 exports.user = user_1.default;
 const auth_1 = __importDefault(require("./auth"));
 exports.auth = auth_1.default;
 const component_1 = __importDefault(require("./component"));
 exports.component = component_1.default;
+const fallback_1 = __importDefault(require("./fallback"));
+exports.fallback = fallback_1.default;
 exports.default = {
     user: user_1.default,
     auth: auth_1.default,
     component: component_1.default,
+    fallback: fallback_1.default,
 };

package/lib/middlewares/user.d.ts

@@ -2,6 +2,7 @@ import { NextFunction, Request, Response } from 'express';
 type User = {
     did: string;
     role: string | undefined;
+    provider: string;
     fullName: string;
 };
 declare const userMiddleware: () => (req: Request & {

package/lib/middlewares/user.js

@@ -4,6 +4,7 @@ const userMiddleware = () => (req, res, next) => {
         req.user = {
             did: req.headers['x-user-did'],
             role: req.headers['x-user-role'],
+            provider: req.headers['x-user-provider'],
             fullName: decodeURIComponent(req.headers['x-user-fullname']),
         };
     }

package/lib/service/notification.js

@@ -153,7 +153,8 @@ const initClient = () => {
                 });
             }
         });
-        [constant_1.BlockletInternalEvents.componentsUpdated, constant_1.BlockletInternalEvents.appConfigChanged].forEach((event) => {
+        Object.keys(constant_1.BlockletInternalEvents).forEach((key) => {
+            const event = constant_1.BlockletInternalEvents[key];
             messageChannel.on(event, ({ status, response } = {}) => {
                 if (status === 'ok') {
                     const { data, sender } = response;

package/lib/util/axios.d.ts

@@ -0,0 +1,2 @@
+declare const axios: any;
+export = axios;

package/lib/util/axios.js

@@ -0,0 +1,26 @@
+"use strict";
+const Axios = require('axios');
+const http = require('http');
+const https = require('https');
+// Force all requests routed to local host
+const getAgent = (type) => {
+    const agent = { http, https }[type].Agent();
+    agent.originCreateConnection = agent.createConnection;
+    agent.createConnection = (options, callback) => {
+        options.lookup = (hostname, opts, cb) => {
+            const host = {
+                address: '127.0.0.1',
+                family: 4,
+            };
+            return cb(null, host.address, host.family);
+        };
+        return agent.originCreateConnection(options, callback);
+    };
+    return agent;
+};
+const axios = Axios.create({
+    proxy: false,
+    httpAgent: getAgent('http'),
+    httpsAgent: getAgent('https'),
+});
+module.exports = axios;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-a90ba909",
+  "version": "1.16.14-beta-c2843ec5",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.14-beta-a90ba909",
-    "@abtnode/constant": "1.16.14-beta-a90ba909",
+    "@abtnode/client": "1.16.14-beta-c2843ec5",
+    "@abtnode/constant": "1.16.14-beta-c2843ec5",
     "@arcblock/did": "1.18.87",
     "@arcblock/did-auth": "1.18.87",
     "@arcblock/jwt": "1.18.87",
     "@arcblock/ws": "1.18.87",
-    "@blocklet/constant": "1.16.14-beta-a90ba909",
-    "@blocklet/env": "1.16.14-beta-a90ba909",
-    "@blocklet/meta": "1.16.14-beta-a90ba909",
+    "@blocklet/constant": "1.16.14-beta-c2843ec5",
+    "@blocklet/env": "1.16.14-beta-c2843ec5",
+    "@blocklet/meta": "1.16.14-beta-c2843ec5",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/handler": "^2.2.0",
     "@nedb/core": "^2.1.5",
@@ -73,5 +73,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "a59c9970f447462db0ccfee75b277e98bb11a6fa"
+  "gitHead": "968bfad93779a21dd1374eede3ac7d4d6d40822b"
 }