plugin-file-preview-auth 1.3.9 → 1.3.11

package/src/server/ocr/tesseract-worker.ts

@@ -1,6 +1,9 @@
 import { TesseractRunner } from './tesseract-runner';
 import path from 'path';
 
+export const WORKER_JOB_FILE_PREVIEW_OCR_PROCESS = 'file-preview-auth:ocr';
+export const FILE_PREVIEW_OCR_QUEUE_REDIS_KEY = 'file-preview-auth.ocr.queue';
+
 export class TesseractWorker {
   private app: any;
   private db: any;
@@ -8,7 +11,7 @@ export class TesseractWorker {
   private runner: TesseractRunner;
   private isRunning = false;
   private pollTimer: NodeJS.Timeout | null = null;
-  private redisKey = 'file-preview-auth.ocr.queue';
+  private redisKey = FILE_PREVIEW_OCR_QUEUE_REDIS_KEY;
 
   constructor(app: any) {
     this.app = app;

package/src/server/plugin.ts

@@ -7,14 +7,18 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Plugin } from '@nocobase/server';
+import { Plugin, type Application } from '@nocobase/server';
 import { koaMulter as multer } from '@nocobase/utils';
 import { ExcelParserHandler } from './excel-parser-handler';
 import { readFile, unlink } from 'fs/promises';
 import os from 'os';
 import path from 'path';
 import { col } from 'sequelize';
-import { TesseractWorker } from './ocr/tesseract-worker';
+import {
+  FILE_PREVIEW_OCR_QUEUE_REDIS_KEY,
+  TesseractWorker,
+  WORKER_JOB_FILE_PREVIEW_OCR_PROCESS,
+} from './ocr/tesseract-worker';
 
 const FILE_PREVIEW_WORK_CONTEXT_TYPE = 'file-preview';
 const MAX_AI_CONTEXT_CHARS = 50000;
@@ -39,8 +43,10 @@ export class PluginFilePreviewAuthServer extends Plugin {
 
     this.app.on('afterStart', async () => {
       await this.disableBuiltinOfficePreviewer();
-      if (this.ocrWorker) {
+      if (this.ocrWorker && isFilePreviewOcrWorker(this.app)) {
         await this.ocrWorker.start();
+      } else {
+        this.log.debug('[FilePreviewAuth] OCR worker disabled on this node by WORKER_MODE.');
       }
     });
   }
@@ -380,9 +386,23 @@ export class PluginFilePreviewAuthServer extends Plugin {
             ctx.attachment(attachmentObj.filename);
             ctx.body = stream;
             // S3 Private Bucket Handler
-          } catch (err) {
+          } catch (err: any) {
             this.log.error(`[FilePreviewAuth] Error fetching stream for URL ${url}: ${err.message}`);
-            ctx.throw(500, 'Failed to fetch the file from storage');
+            try {
+              require('fs').writeFileSync(
+                require('path').join(process.cwd(), 'preview_error.log'),
+                `Error fetching stream for URL ${url}:\n` +
+                  `Time: ${new Date().toISOString()}\n` +
+                  `Message: ${err.message}\n` +
+                  `Stack: ${err.stack}\n` +
+                  `Attachment: ${JSON.stringify(attachment, null, 2)}\n` +
+                  `AttachmentObj: ${JSON.stringify(attachmentObj, null, 2)}\n` +
+                  `StorageModel: ${JSON.stringify(storageModel, null, 2)}\n`,
+              );
+            } catch (fsErr: any) {
+              this.log.error(`[FilePreviewAuth] Failed to write preview_error.log: ${fsErr.message}`);
+            }
+            ctx.throw(500, `Failed to fetch the file from storage: ${err.message}`);
           }
 
           await next();
@@ -1187,6 +1207,24 @@ export class PluginFilePreviewAuthServer extends Plugin {
 
 export default PluginFilePreviewAuthServer;
 
+function isFilePreviewOcrWorker(app: Application) {
+  return app.serving(WORKER_JOB_FILE_PREVIEW_OCR_PROCESS) || workerModeServesFilePreviewOcr();
+}
+
+function workerModeServesFilePreviewOcr() {
+  const workerModes = String(process.env.WORKER_MODE || '')
+    .split(',')
+    .map((mode) => mode.trim())
+    .filter(Boolean);
+
+  return workerModes.some((mode) => {
+    if (mode === '*' || mode === 'worker' || mode === 'task' || mode === WORKER_JOB_FILE_PREVIEW_OCR_PROCESS) {
+      return true;
+    }
+    return mode === FILE_PREVIEW_OCR_QUEUE_REDIS_KEY;
+  });
+}
+
 function safeDebugJson(value: unknown): string {
   try {
     return JSON.stringify(value, (_key, item) => (typeof item === 'bigint' ? item.toString() : item));