@quatrain/worker 1.1.21 → 1.1.24

package/lib/FileSystem.js

@@ -91,6 +91,7 @@ class FileSystem {
     static uploadFile(filename, meta, mime = 'video/mp4') {
         // try to get more file metadata
         meta = { ...meta, ...FileSystem.getInfo(filename) };
+        Worker_1.Worker.info(`Uploading file ${filename} with size ${meta.size} bytes to ${meta.uploadUrl}`);
         return new Promise((resolve, reject) => {
             try {
                 let done = 0; // total bytes uploaded
@@ -137,7 +138,7 @@ class FileSystem {
                     Worker_1.Worker.error(err);
                     reject(err);
                 }
-                Worker_1.Worker.debug(`ffprobe getInfo: ${JSON.stringify(metadata)}`);
+                //   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);

package/lib/Handler.d.ts

@@ -0,0 +1 @@
+export declare const handler: (messageHandler: Function, config: any, adapters: any) => Promise<void>;

package/lib/Handler.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = void 0;
+const Worker_1 = require("./Worker");
+const handler = async (messageHandler, config, adapters) => {
+    try {
+        Worker_1.Worker.info(`Worker version ${require('../package.json').version} started in ${config.MQ_MODE} mode`);
+        switch (config.MQ_MODE) {
+            case 'queue':
+                const { Queue } = require('@quatrain/queue');
+                Queue.addQueue(adapters.queue, 'default', true);
+                Queue.info(`Connecting to amqp://${config.MQ_HOST}:${config.MQ_PORT}`);
+                Queue.getQueue().listen(config.MQ_TOPIC, messageHandler);
+                Queue.info(`Connected and listening to ${config.MQ_TOPIC}, ready to receive messages.`);
+                break;
+            case 'cli':
+            case 'test':
+                Worker_1.Worker.warn(`Message received from CLI.`);
+                const json = config.MQ_MODE === 'test'
+                    ? require('../test.json')
+                    : process.env.JSON;
+                if (!json) {
+                    throw new Error(`CLI call with missing environment variables`);
+                }
+                await messageHandler(json);
+                break;
+            default:
+                Worker_1.Worker.error(`Unknown mode option: '${config.MQ_MODE}'`);
+                process.exit(1);
+        }
+    }
+    catch (error) {
+        Worker_1.Worker.error(error.message);
+        process.exit(1);
+    }
+};
+exports.handler = handler;

package/lib/Worker.d.ts

@@ -1,4 +1,5 @@
 import { Core } from '@quatrain/core';
+import { HandlerParameters } from './types/HandlerParameters';
 export declare class Worker extends Core {
     static endpoint: string;
     static logger: any;
@@ -19,4 +20,10 @@ export declare class Worker extends Core {
      * @returns boolean
      */
     static pushEvent(event: string, data?: {}, ts?: number): false | undefined;
+    /**
+     * Global handling function to process received messages
+     * @param messageHandler function
+     * @param config object
+     */
+    static handler: (messageHandler: Function, config: HandlerParameters) => Promise<void>;
 }

package/lib/Worker.js

@@ -69,5 +69,40 @@ class Worker extends core_1.Core {
             return false;
         });
     }
+    /**
+     * Global handling function to process received messages
+     * @param messageHandler function
+     * @param config object
+     */
+    static handler = async (messageHandler, config) => {
+        try {
+            switch (config.mode) {
+                case 'queue':
+                    const { Queue } = require('@quatrain/queue');
+                    Queue.addQueue(config.queueAdapter, 'default', true);
+                    Queue.getQueue().listen(config.topic, messageHandler);
+                    Queue.info(`Connected and listening to ${config.topic}, ready to receive messages.`);
+                    break;
+                case 'cli':
+                case 'test':
+                    Worker.warn(`Message received from CLI.`);
+                    const json = config.mode === 'test'
+                        ? require('../test.json')
+                        : process.env.JSON;
+                    if (!json) {
+                        throw new Error(`CLI call with missing environment variables`);
+                    }
+                    await messageHandler(json);
+                    break;
+                default:
+                    Worker.error(`Unknown mode option: '${config.mode}'`);
+                    process.exit(1);
+            }
+        }
+        catch (error) {
+            Worker.error(error.message);
+            process.exit(1);
+        }
+    };
 }
 exports.Worker = Worker;

package/lib/index.d.ts

@@ -1,3 +1,5 @@
 import { Worker } from './Worker';
 import { FileSystem } from './FileSystem';
-export { Worker, FileSystem };
+import { HandlerParameters } from './types/HandlerParameters';
+import { ModeEnum } from './types/ModeEnum';
+export { Worker, FileSystem, ModeEnum, HandlerParameters };

package/lib/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileSystem = exports.Worker = void 0;
+exports.ModeEnum = exports.FileSystem = exports.Worker = void 0;
 const Worker_1 = require("./Worker");
 Object.defineProperty(exports, "Worker", { enumerable: true, get: function () { return Worker_1.Worker; } });
 const FileSystem_1 = require("./FileSystem");
 Object.defineProperty(exports, "FileSystem", { enumerable: true, get: function () { return FileSystem_1.FileSystem; } });
+const ModeEnum_1 = require("./types/ModeEnum");
+Object.defineProperty(exports, "ModeEnum", { enumerable: true, get: function () { return ModeEnum_1.ModeEnum; } });

package/lib/types/HandlerParameters copy.d.ts

@@ -0,0 +1,8 @@
+export declare const MODE_CLI = "cli";
+export declare const MODE_QUEUE = "queue";
+export declare const MODE_TEST = "test";
+export interface HandlerParameters {
+    mode: typeof MODE_QUEUE | typeof MODE_CLI | typeof MODE_TEST;
+    topic?: string;
+    config?: {};
+}

package/lib/types/HandlerParameters copy.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MODE_TEST = exports.MODE_QUEUE = exports.MODE_CLI = void 0;
+exports.MODE_CLI = 'cli';
+exports.MODE_QUEUE = 'queue';
+exports.MODE_TEST = 'test';

package/lib/types/HandlerParameters.d.ts

@@ -0,0 +1,7 @@
+import { ModeEnum } from './ModeEnum';
+import { AbstractQueueAdapter } from '@quatrain/queue';
+export interface HandlerParameters {
+    mode: string | typeof ModeEnum;
+    topic?: string;
+    queueAdapter?: AbstractQueueAdapter;
+}

package/lib/types/HandlerParameters.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/ModeEnum.d.ts

@@ -0,0 +1,5 @@
+export declare enum ModeEnum {
+    MODE_CLI = "cli",
+    MODE_QUEUE = "queue",
+    MODE_TEST = "test"
+}

package/lib/types/ModeEnum.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModeEnum = void 0;
+var ModeEnum;
+(function (ModeEnum) {
+    ModeEnum["MODE_CLI"] = "cli";
+    ModeEnum["MODE_QUEUE"] = "queue";
+    ModeEnum["MODE_TEST"] = "test";
+})(ModeEnum || (exports.ModeEnum = ModeEnum = {}));

package/lib/types/ModeTypes.d.ts

@@ -0,0 +1,5 @@
+export declare enum ModeEnum {
+    MODE_CLI = "cli",
+    MODE_QUEUE = "queue",
+    MODE_TEST = "test"
+}

package/lib/types/ModeTypes.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModeEnum = void 0;
+var ModeEnum;
+(function (ModeEnum) {
+    ModeEnum["MODE_CLI"] = "cli";
+    ModeEnum["MODE_QUEUE"] = "queue";
+    ModeEnum["MODE_TEST"] = "test";
+})(ModeEnum || (exports.ModeEnum = ModeEnum = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/worker",
-  "version": "1.1.21",
+  "version": "1.1.24",
   "description": "Container Worker helpers",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,8 @@
     "typescript": "^5.1.5"
   },
   "dependencies": {
-    "@quatrain/core": "^1.1.18",
+    "@quatrain/core": "^1.1.19",
+    "@quatrain/queue": "^1.1.15",
     "axios": "^1.7.7",
     "fluent-ffmpeg": "^2.1.2",
     "fs-extra": "^11.2.0",