@quatrain/worker 1.1.14 → 1.1.16

package/lib/FileSystem.d.ts

@@ -1,8 +1,20 @@
+import { FileType } from '@quatrain/storage';
 export declare class FileSystem {
     static prepare(folder: string): void;
     static makeFolder(folder: string): void;
     static removeFolder(folder: string, recursively?: boolean): void;
     static downloadFile(url: string, filepath: string): Promise<unknown>;
     static safeString(name: string): string;
-    static uploadFile(filename: string, destination: string, mime?: string): Promise<unknown>;
+    /**
+     * Upload file to public URL and return meta data
+     * @param filename string
+     * @param meta
+     * @param mime
+     * @returns Promise
+     */
+    static uploadFile(filename: string, meta: FileType, mime?: string): Promise<FileType>;
+    /**
+     * Return meta data on given file
+     */
+    static getInfo: (file: string) => Promise<any>;
 }

package/lib/FileSystem.js

@@ -1,45 +1,69 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSystem = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const axios_1 = __importDefault(require("axios"));
 const Worker_1 = require("./Worker");
 const node_fetch_native_1 = __importDefault(require("node-fetch-native"));
+const ffmpeg = __importStar(require("fluent-ffmpeg"));
 class FileSystem {
     static prepare(folder) {
         Worker_1.Worker.log(`Setting up process folder ${folder}`);
         this.removeFolder(folder);
-        fs_1.default.mkdirSync(folder);
-        fs_1.default.mkdirSync(folder + path_1.default.sep + 'images');
-        fs_1.default.mkdirSync(folder + path_1.default.sep + 'vecto');
+        node_fs_1.default.mkdirSync(folder);
+        node_fs_1.default.mkdirSync(folder + node_path_1.default.sep + 'images');
+        node_fs_1.default.mkdirSync(folder + node_path_1.default.sep + 'vecto');
     }
     static makeFolder(folder) {
-        fs_1.default.mkdirSync(folder);
+        node_fs_1.default.mkdirSync(folder);
     }
     static removeFolder(folder, recursively = true) {
-        if (fs_1.default.existsSync(folder)) {
-            fs_1.default.readdirSync(folder).forEach((element) => {
-                const item = path_1.default.join(folder, element);
-                if (fs_1.default.lstatSync(item).isDirectory()) {
+        if (node_fs_1.default.existsSync(folder)) {
+            node_fs_1.default.readdirSync(folder).forEach((element) => {
+                const item = node_path_1.default.join(folder, element);
+                if (node_fs_1.default.lstatSync(item).isDirectory()) {
                     if (recursively !== true) {
                         throw new Error(`Folder contains folder`);
                     }
                     this.removeFolder(item);
                 }
                 else {
-                    fs_1.default.unlinkSync(item);
+                    node_fs_1.default.unlinkSync(item);
                 }
             });
-            fs_1.default.rmdirSync(folder);
+            node_fs_1.default.rmdirSync(folder);
         }
     }
     static async downloadFile(url, filepath) {
         try {
-            const writer = fs_1.default.createWriteStream(filepath);
+            const writer = node_fs_1.default.createWriteStream(filepath);
             const response = await axios_1.default.get(url, {
                 responseType: 'stream',
             });
@@ -82,13 +106,22 @@ class FileSystem {
     //       }
     //    })
     // }
-    static uploadFile(filename, destination, mime = 'video/mp4') {
+    /**
+     * Upload file to public URL and return meta data
+     * @param filename string
+     * @param meta
+     * @param mime
+     * @returns Promise
+     */
+    static uploadFile(filename, meta, mime = 'video/mp4') {
+        // try to get more file metadata
+        meta = { ...meta, ...FileSystem.getInfo(filename) };
         return new Promise((resolve, reject) => {
             try {
                 let done = 0; // total bytes uploaded
                 let prev = 0; // latest value of done stored when % done was displayed
-                const { size } = fs_1.default.statSync(filename);
-                const readStream = fs_1.default.createReadStream(filename);
+                const { size } = node_fs_1.default.statSync(filename);
+                const readStream = node_fs_1.default.createReadStream(filename);
                 const sizeMB = (size / (1024 * 1024)).toFixed(2);
                 readStream.on('data', (data) => {
                     done += data.length;
@@ -100,17 +133,17 @@ class FileSystem {
                     }
                 });
                 Worker_1.Worker.info(`Uploading file ${filename} with size ${size} bytes`);
-                (0, node_fetch_native_1.default)(destination, {
+                (0, node_fetch_native_1.default)(meta.uploadUrl, {
                     method: 'PUT',
                     mode: 'cors',
                     duplex: 'half',
                     body: readStream,
                     headers: {
-                        'Content-Type': mime,
+                        'Content-Type': meta.contentType || mime,
                         'Content-length': String(size),
                     },
                 })
-                    .then((res) => resolve(res))
+                    .then((res) => resolve({ ...meta, size, uploadUrl: undefined }))
                     .catch((err) => reject(err));
             }
             catch (err) {
@@ -119,5 +152,31 @@ class FileSystem {
             }
         });
     }
+    /**
+     * Return meta data on given file
+     */
+    static getInfo = (file) => {
+        if (file.endsWith('.mp4') || file.endsWith('.insv')) {
+            return new Promise((resolve, reject) => ffmpeg.ffprobe(file, (err, metadata) => {
+                if (err) {
+                    Worker_1.Worker.error(err);
+                    reject(err);
+                }
+                Worker_1.Worker.debug(`ffprobe getInfo: ${JSON.stringify(metadata)}`);
+                const { width, height, duration, bit_rate: bitrate, nb_frames: nbFramees, } = metadata.streams[0];
+                const nb_frames = parseFloat(nbFramees);
+                const framerate = nb_frames / parseFloat(duration);
+                resolve({
+                    width,
+                    height,
+                    framerate: framerate.toFixed(0),
+                    duration: parseInt(duration),
+                    bitrate,
+                });
+            }));
+        }
+        // Handle other cases silently
+        return new Promise((resolve) => resolve({}));
+    };
 }
 exports.FileSystem = FileSystem;

package/lib/Worker.d.ts

@@ -10,5 +10,12 @@ export declare class Worker extends Core {
      * @return Promise
      */
     static execPromise: (command: string, args?: any[], cwd?: string) => Promise<any>;
+    /**
+     * Push an event to the backend endpoint, if available
+     * @param event string
+     * @param data
+     * @param ts timestamp
+     * @returns boolean
+     */
     static pushEvent(event: string, data?: {}, ts?: number): false | undefined;
 }

package/lib/Worker.js

@@ -41,6 +41,13 @@ class Worker extends core_1.Core {
             });
         });
     };
+    /**
+     * Push an event to the backend endpoint, if available
+     * @param event string
+     * @param data
+     * @param ts timestamp
+     * @returns boolean
+     */
     static pushEvent(event, data = {}, ts = 0) {
         if (!this.endpoint) {
             Worker.warn(`Events endpoint is not set, can't send update!`);
@@ -56,8 +63,14 @@ class Worker extends core_1.Core {
         };
         axios_1.default
             .patch(Worker.endpoint, payload)
-            .then((res) => Worker.info(`Event pushed to backend: ${res.statusText}`))
-            .catch((err) => Worker.error(`Failed to push event to backend: ${err}`));
+            .then((res) => {
+            Worker.info(`Event pushed to backend: ${res.statusText}`);
+            return true;
+        })
+            .catch((err) => {
+            Worker.error(`Failed to push event to backend: ${err}`);
+            return false;
+        });
     }
 }
 exports.Worker = Worker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/worker",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "Container Worker helpers",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -12,6 +12,7 @@
   "license": "MIT",
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.1",
+    "@types/fluent-ffmpeg": "^2",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^27.0.3",
     "@types/node": "^22.9.0",
@@ -24,8 +25,9 @@
     "typescript": "^5.1.5"
   },
   "dependencies": {
-    "@quatrain/core": "^1.1.11",
+    "@quatrain/core": "^1.1.14",
     "axios": "^1.7.7",
+    "fluent-ffmpeg": "^2.1.2",
     "fs-extra": "^11.2.0",
     "node-fetch-native": "^1.6.4"
   },