@blocklet/uploader-server 0.2.4 → 0.2.6

package/es/utils.js

@@ -3,6 +3,7 @@ import path from "path";
 import joinUrl from "url-join";
 import { isbot } from "isbot";
 import component from "@blocklet/sdk/lib/component";
+import Auth from "@blocklet/sdk/service/auth";
 import { ImageBinDid } from "./constants.js";
 import crypto from "crypto";
 import { getSignData } from "@blocklet/sdk/lib/util/verify-sign";
@@ -14,6 +15,8 @@ import { existsSync, readdirSync, renameSync, statSync, unlinkSync, createReadSt
 import { join } from "path";
 import ExifTransformer from "exif-be-gone";
 export let logger = console;
+const isProduction = process.env.NODE_ENV === "production" || process.env.ABT_NODE_SERVICE_ENV === "production";
+const client = new Auth();
 if (process.env.BLOCKLET_LOG_DIR) {
   try {
     const initLogger = require("@blocklet/logger");
@@ -41,11 +44,26 @@ export async function getTrustedDomainsCache({
       return trustedDomainsCache.domains;
     }
   }
-  trustedDomainsCache.domains = await axios.get(joinUrl(appUrl, "/.well-known/service/api/federated/getTrustedDomains")).then((res) => res.data);
-  trustedDomainsCache.timestamp = now;
+  try {
+    if (!trustedDomainsCache?.domains?.length) {
+      trustedDomainsCache.domains = await client.getTrustedDomains().then((res) => res.data);
+      trustedDomainsCache.timestamp = now;
+    }
+  } catch (error) {
+  }
+  try {
+    if (!trustedDomainsCache?.domains?.length) {
+      trustedDomainsCache.domains = await axios.get(joinUrl(appUrl, "/.well-known/service/api/federated/getTrustedDomains")).then((res) => res.data);
+      trustedDomainsCache.timestamp = now;
+    }
+  } catch (error) {
+  }
   return trustedDomainsCache.domains;
 }
 export async function checkTrustedReferer(req, res, next) {
+  if (!isProduction) {
+    return next?.();
+  }
   if (isbot(req.get("user-agent"))) {
     return next?.();
   }

package/lib/utils.js

@@ -21,6 +21,7 @@ var _path = _interopRequireWildcard(require("path"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _isbot = require("isbot");
 var _component = _interopRequireDefault(require("@blocklet/sdk/lib/component"));
+var _auth = _interopRequireDefault(require("@blocklet/sdk/service/auth"));
 var _constants = require("./constants");
 var _crypto = _interopRequireDefault(require("crypto"));
 var _verifySign = require("@blocklet/sdk/lib/util/verify-sign");
@@ -34,6 +35,8 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let logger = exports.logger = console;
+const isProduction = process.env.NODE_ENV === "production" || process.env.ABT_NODE_SERVICE_ENV === "production";
+const client = new _auth.default();
 if (process.env.BLOCKLET_LOG_DIR) {
   try {
     const initLogger = require("@blocklet/logger");
@@ -60,11 +63,24 @@ async function getTrustedDomainsCache({
       return trustedDomainsCache.domains;
     }
   }
-  trustedDomainsCache.domains = await _axios.default.get((0, _urlJoin.default)(appUrl, "/.well-known/service/api/federated/getTrustedDomains")).then(res => res.data);
-  trustedDomainsCache.timestamp = now;
+  try {
+    if (!trustedDomainsCache?.domains?.length) {
+      trustedDomainsCache.domains = await client.getTrustedDomains().then(res => res.data);
+      trustedDomainsCache.timestamp = now;
+    }
+  } catch (error) {}
+  try {
+    if (!trustedDomainsCache?.domains?.length) {
+      trustedDomainsCache.domains = await _axios.default.get((0, _urlJoin.default)(appUrl, "/.well-known/service/api/federated/getTrustedDomains")).then(res => res.data);
+      trustedDomainsCache.timestamp = now;
+    }
+  } catch (error) {}
   return trustedDomainsCache.domains;
 }
 async function checkTrustedReferer(req, res, next) {
+  if (!isProduction) {
+    return next?.();
+  }
   if ((0, _isbot.isbot)(req.get("user-agent"))) {
     return next?.();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/uploader-server",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "blocklet upload server",
   "publishConfig": {
     "access": "public"
@@ -49,10 +49,10 @@
     "axios": "^1.7.8"
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.47",
-    "@blocklet/constant": "^1.16.47",
-    "@blocklet/logger": "^1.16.47",
-    "@blocklet/sdk": "^1.16.47",
+    "@abtnode/cron": "^1.16.48",
+    "@blocklet/constant": "^1.16.48",
+    "@blocklet/logger": "^1.16.48",
+    "@blocklet/sdk": "^1.16.48",
     "@tus/file-store": "1.0.0",
     "@tus/server": "1.0.0",
     "@uppy/companion": "4.15.1",