@blocklet/uploader-server 0.1.101 → 0.1.102

package/es/middlewares/local-storage.js

@@ -7,7 +7,7 @@ import crypto from "crypto";
 import mime from "mime-types";
 import joinUrlLib from "url-join";
 import queue from "p-queue";
-import { setPDFDownloadHeader, logger } from "../utils.js";
+import { setPDFDownloadHeader, logger, removeExifFromFile } from "../utils.js";
 const validFilePathInDirPath = (dirPath, filePath) => {
   const fileName = path.basename(filePath);
   if (!filePath.startsWith(dirPath) || path.join(dirPath, fileName) !== filePath) {
@@ -85,6 +85,11 @@ export function initLocalStorageServer({
     res.setHeader("x-uploader-file-exist", true);
     uploadMetadata = formatMetadata(uploadMetadata);
     await rewriteMetaDataFile(uploadMetadata);
+    try {
+      await removeExifFromFile(uploadMetadata.runtime.absolutePath);
+    } catch (err) {
+      logger.error("failed to remove EXIF from file", err);
+    }
     if (_onUploadFinish) {
       try {
         const result = await _onUploadFinish(req, res, uploadMetadata);

package/es/utils.d.ts

@@ -49,4 +49,8 @@ export declare function scanDirectory(directory: string, options?: {
     blockletInfo?: any;
 }): Map<string, ResourceFile>;
 export declare function getFileNameFromReq(req: any): any;
+/**
+ * Remove EXIF from file
+ */
+export declare const removeExifFromFile: (filePath: string) => Promise<void>;
 export {};

package/es/utils.js

@@ -4,15 +4,15 @@ import joinUrl from "url-join";
 import { isbot } from "isbot";
 import component from "@blocklet/sdk/lib/component";
 import { ImageBinDid } from "./constants.js";
-import { createReadStream } from "fs";
 import crypto from "crypto";
 import { getSignData } from "@blocklet/sdk/lib/util/verify-sign";
 import FormData from "form-data";
 import omit from "lodash/omit";
 import ms from "ms";
 import mime from "mime-types";
-import { existsSync, readdirSync, statSync } from "fs";
+import { existsSync, readdirSync, renameSync, statSync, unlinkSync, createReadStream, createWriteStream } from "fs";
 import { join } from "path";
+import ExifTransformer from "exif-be-gone";
 export let logger = console;
 if (process.env.BLOCKLET_LOG_DIR) {
   try {
@@ -277,3 +277,24 @@ export function getFileNameFromReq(req) {
   const pathname = req.path || req.url?.split("?")[0];
   return path.basename(decodeURIComponent(pathname || ""));
 }
+export const removeExifFromFile = async (filePath) => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      statSync(filePath);
+    } catch (e) {
+      reject(e);
+      return;
+    }
+    const tempPath = filePath + ".tmp";
+    const reader = createReadStream(filePath);
+    const writer = createWriteStream(tempPath);
+    reader.pipe(new ExifTransformer()).pipe(writer).on("finish", () => {
+      renameSync(tempPath, filePath);
+      resolve();
+    }).on("error", (err) => {
+      logger.error("[exif-be-gone] failed", err);
+      unlinkSync(tempPath);
+      reject(err);
+    });
+  });
+};

package/lib/middlewares/local-storage.js

@@ -105,6 +105,11 @@ function initLocalStorageServer({
     res.setHeader("x-uploader-file-exist", true);
     uploadMetadata = formatMetadata(uploadMetadata);
     await rewriteMetaDataFile(uploadMetadata);
+    try {
+      await (0, _utils.removeExifFromFile)(uploadMetadata.runtime.absolutePath);
+    } catch (err) {
+      _utils.logger.error("failed to remove EXIF from file", err);
+    }
     if (_onUploadFinish) {
       try {
         const result = await _onUploadFinish(req, res, uploadMetadata);

package/lib/utils.d.ts

@@ -49,4 +49,8 @@ export declare function scanDirectory(directory: string, options?: {
     blockletInfo?: any;
 }): Map<string, ResourceFile>;
 export declare function getFileNameFromReq(req: any): any;
+/**
+ * Remove EXIF from file
+ */
+export declare const removeExifFromFile: (filePath: string) => Promise<void>;
 export {};

package/lib/utils.js

@@ -11,6 +11,7 @@ exports.getMediaKitFileStream = getMediaKitFileStream;
 exports.getTrustedDomainsCache = getTrustedDomainsCache;
 exports.logger = void 0;
 exports.proxyImageDownload = proxyImageDownload;
+exports.removeExifFromFile = void 0;
 exports.scanDirectory = scanDirectory;
 exports.serveResource = serveResource;
 exports.setPDFDownloadHeader = setPDFDownloadHeader;
@@ -21,13 +22,14 @@ var _urlJoin = _interopRequireDefault(require("url-join"));
 var _isbot = require("isbot");
 var _component = _interopRequireDefault(require("@blocklet/sdk/lib/component"));
 var _constants = require("./constants");
-var _fs = require("fs");
 var _crypto = _interopRequireDefault(require("crypto"));
 var _verifySign = require("@blocklet/sdk/lib/util/verify-sign");
 var _formData = _interopRequireDefault(require("form-data"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _ms = _interopRequireDefault(require("ms"));
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
+var _fs = require("fs");
+var _exifBeGone = _interopRequireDefault(require("exif-be-gone"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 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 }; }
@@ -300,4 +302,26 @@ function scanDirectory(directory, options = {}) {
 function getFileNameFromReq(req) {
   const pathname = req.path || req.url?.split("?")[0];
   return _path.default.basename(decodeURIComponent(pathname || ""));
-}
+}
+const removeExifFromFile = async filePath => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      (0, _fs.statSync)(filePath);
+    } catch (e) {
+      reject(e);
+      return;
+    }
+    const tempPath = filePath + ".tmp";
+    const reader = (0, _fs.createReadStream)(filePath);
+    const writer = (0, _fs.createWriteStream)(tempPath);
+    reader.pipe(new _exifBeGone.default()).pipe(writer).on("finish", () => {
+      (0, _fs.renameSync)(tempPath, filePath);
+      resolve();
+    }).on("error", err => {
+      logger.error("[exif-be-gone] failed", err);
+      (0, _fs.unlinkSync)(tempPath);
+      reject(err);
+    });
+  });
+};
+exports.removeExifFromFile = removeExifFromFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/uploader-server",
-  "version": "0.1.101",
+  "version": "0.1.102",
   "description": "blocklet upload server",
   "publishConfig": {
     "access": "public"
@@ -58,6 +58,7 @@
     "@uppy/companion": "4.15.1",
     "axios": "^1.7.8",
     "body-parser": "^1.20.3",
+    "exif-be-gone": "^1.5.1",
     "express-session": "1.17.3",
     "glob": "^11.0.1",
     "isbot": "^5.1.17",