@blocklet/sdk 1.16.15-beta-e4ad74af → 1.16.15-beta-e143b1cf

package/lib/middlewares/fallback.d.ts

@@ -5,8 +5,6 @@ type PageData = {
     ogImage?: string;
 };
 type FallbackOptions = {
-    cacheControl?: boolean | undefined;
-    maxAge?: string | number | undefined;
     root?: string | undefined;
     getPageData?: (req: Request) => Promise<PageData>;
 };

package/lib/middlewares/fallback.js

@@ -12,7 +12,7 @@ const fallback = (file, options = {}) => {
     if ((0, fs_1.existsSync)(filePath) === false) {
         throw new Error(`Fallback file not found at: ${filePath}`);
     }
-    let source = (0, fs_1.readFileSync)(filePath).toString();
+    const sourceRaw = (0, fs_1.readFileSync)(filePath).toString();
     return async (req, res, next) => {
         if ((req.method === 'GET' || req.method === 'HEAD') && req.accepts('html')) {
             res.type('html');
@@ -20,7 +20,8 @@ const fallback = (file, options = {}) => {
             const pageData = typeof options.getPageData === 'function' ? await options.getPageData(req) : {};
             pageData.title = (0, escape_1.default)(pageData.title || config_1.env.appName);
             pageData.description = (0, escape_1.default)(pageData.description || config_1.env.appDescription);
-            pageData.ogImage = (0, escape_1.default)(pageData.ogImage || (0, url_join_1.default)(config_1.env.appUrl || '/', '/.well-known/service/blocklet/og.png'));
+            pageData.ogImage = pageData.ogImage || (0, url_join_1.default)(config_1.env.appUrl || '/', '/.well-known/service/blocklet/og.png');
+            let source = sourceRaw.slice(0);
             // inject seo title
             if (pageData.title) {
                 if (source.indexOf('<title>') === -1) {
@@ -52,6 +53,10 @@ const fallback = (file, options = {}) => {
                     .replace('<script src="__blocklet__.js"></script>', `<script>${blockletJs}</script>`)
                     .replace('<script src="__meta__.js"></script>', `<script>${blockletJs}</script>`);
             }
+            // disable cache for generated html
+            res.setHeader('Surrogate-Control', 'no-store');
+            res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
+            res.setHeader('Expires', '0');
             res.send(source);
             // istanbul-ignore-next
             if (process.env.NODE_ENV === 'test') {

package/lib/middlewares/index.d.ts

@@ -26,8 +26,6 @@ declare const _default: {
         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;
         getPageData?: (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>) => Promise<{
             title?: string;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-e4ad74af",
+  "version": "1.16.15-beta-e143b1cf",
   "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",
-    "@abtnode/constant": "1.16.14",
+    "@abtnode/client": "1.16.15-beta-e143b1cf",
+    "@abtnode/constant": "1.16.15-beta-e143b1cf",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/jwt": "1.18.89",
     "@arcblock/ws": "1.18.89",
-    "@blocklet/constant": "1.16.14",
-    "@blocklet/env": "1.16.14",
-    "@blocklet/meta": "1.16.14",
+    "@blocklet/constant": "1.16.15-beta-e143b1cf",
+    "@blocklet/env": "1.16.15-beta-e143b1cf",
+    "@blocklet/meta": "1.16.15-beta-e143b1cf",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/handler": "^2.2.0",
     "@nedb/core": "^2.1.5",
@@ -73,5 +73,6 @@
     "ts-jest": "^27.1.5",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
-  }
+  },
+  "gitHead": "86dcc908f3cb7259d1ca92b9ae75160a6e43509a"
 }