@quatrain/worker 0.1.0 → 1.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/FileSystem.d.ts +8 -0
- package/lib/FileSystem.js +93 -0
- package/lib/Worker.d.ts +1 -18
- package/lib/Worker.js +4 -88
- package/lib/index.d.ts +2 -1
- package/lib/index.js +3 -1
- package/package.json +38 -36
- package/lib/AbstractQueueAdapter.d.ts +0 -8
- package/lib/AbstractQueueAdapter.js +0 -9
- package/lib/types/QueueAdapterInterface.d.ts +0 -4
- package/lib/types/QueueAdapterInterface.js +0 -2
- package/lib/types/QueueParameters.d.ts +0 -4
- package/lib/types/QueueParameters.js +0 -2
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare class FileSystem {
|
|
2
|
+
static prepare(folder: string): void;
|
|
3
|
+
static makeFolder(folder: string): void;
|
|
4
|
+
static removeFolder(folder: string, recursively?: boolean): void;
|
|
5
|
+
static downloadFile(url: string, filepath: string): Promise<unknown>;
|
|
6
|
+
static safeString(name: string): string;
|
|
7
|
+
static uploadFile(filename: string, destination: string, mime?: string): Promise<unknown>;
|
|
8
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.FileSystem = void 0;
|
|
16
|
+
const fs_1 = __importDefault(require("fs"));
|
|
17
|
+
const path_1 = __importDefault(require("path"));
|
|
18
|
+
const axios_1 = __importDefault(require("axios"));
|
|
19
|
+
const Worker_1 = require("./Worker");
|
|
20
|
+
class FileSystem {
|
|
21
|
+
static prepare(folder) {
|
|
22
|
+
Worker_1.Worker.log(`Setting up process folder ${folder}`);
|
|
23
|
+
this.removeFolder(folder);
|
|
24
|
+
fs_1.default.mkdirSync(folder);
|
|
25
|
+
fs_1.default.mkdirSync(folder + path_1.default.sep + 'images');
|
|
26
|
+
fs_1.default.mkdirSync(folder + path_1.default.sep + 'vecto');
|
|
27
|
+
}
|
|
28
|
+
static makeFolder(folder) {
|
|
29
|
+
fs_1.default.mkdirSync(folder);
|
|
30
|
+
}
|
|
31
|
+
static removeFolder(folder, recursively = true) {
|
|
32
|
+
if (fs_1.default.existsSync(folder)) {
|
|
33
|
+
fs_1.default.readdirSync(folder).forEach((element) => {
|
|
34
|
+
const item = path_1.default.join(folder, element);
|
|
35
|
+
if (fs_1.default.lstatSync(item).isDirectory()) {
|
|
36
|
+
if (recursively !== true) {
|
|
37
|
+
throw new Error(`Folder contains folder`);
|
|
38
|
+
}
|
|
39
|
+
this.removeFolder(item);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
fs_1.default.unlinkSync(item);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
fs_1.default.rmdirSync(folder);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
static downloadFile(url, filepath) {
|
|
49
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
try {
|
|
51
|
+
const writer = fs_1.default.createWriteStream(filepath);
|
|
52
|
+
const response = yield axios_1.default.get(url, {
|
|
53
|
+
responseType: 'stream',
|
|
54
|
+
});
|
|
55
|
+
response.data.pipe(writer);
|
|
56
|
+
return new Promise((resolve, reject) => {
|
|
57
|
+
writer.on('finish', resolve);
|
|
58
|
+
writer.on('error', reject);
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
console.error(`Download error: ${error.message}`);
|
|
63
|
+
throw error;
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
static safeString(name) {
|
|
68
|
+
return name.replace(/\s+/g, '_');
|
|
69
|
+
}
|
|
70
|
+
static uploadFile(filename, destination, mime = 'application/octet-stream') {
|
|
71
|
+
return new Promise((resolve, reject) => {
|
|
72
|
+
try {
|
|
73
|
+
const { size } = fs_1.default.statSync(filename);
|
|
74
|
+
const bufferContent = fs_1.default.readFileSync(filename);
|
|
75
|
+
fetch(destination, {
|
|
76
|
+
method: 'POST',
|
|
77
|
+
mode: 'cors',
|
|
78
|
+
headers: {
|
|
79
|
+
'Content-Type': mime,
|
|
80
|
+
'Content-length': String(size),
|
|
81
|
+
},
|
|
82
|
+
body: bufferContent,
|
|
83
|
+
})
|
|
84
|
+
.then(() => resolve(undefined))
|
|
85
|
+
.catch((err) => reject(err));
|
|
86
|
+
}
|
|
87
|
+
catch (err) {
|
|
88
|
+
reject(err);
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
exports.FileSystem = FileSystem;
|
package/lib/Worker.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Core } from '@quatrain/core';
|
|
2
2
|
export declare class Worker extends Core {
|
|
3
3
|
static endpoint: string;
|
|
4
|
-
static log(message: any, src?: string): void;
|
|
5
4
|
/**
|
|
6
5
|
* Execute an external command in a promise
|
|
7
6
|
* @see https://stackoverflow.com/questions/46289682/how-to-wait-for-child-process-spawn-execution-with-async-await
|
|
@@ -11,21 +10,5 @@ export declare class Worker extends Core {
|
|
|
11
10
|
* @return Promise
|
|
12
11
|
*/
|
|
13
12
|
static execPromise: (command: string, args?: any[], cwd?: string) => Promise<any>;
|
|
14
|
-
static
|
|
15
|
-
static makeFolder(folder: string): void;
|
|
16
|
-
static removeFolder(folder: string): void;
|
|
17
|
-
static downloadFile(url: string, filepath: string): Promise<unknown>;
|
|
18
|
-
static safeString(name: string): string;
|
|
19
|
-
static pushEvent(event: string, data?: {}, ts?: number): void;
|
|
20
|
-
static pushFile(filepath: string, folder: string, extension?: string): Promise<{
|
|
21
|
-
ref: string;
|
|
22
|
-
label: string | undefined;
|
|
23
|
-
worker: string;
|
|
24
|
-
size: number;
|
|
25
|
-
} | {
|
|
26
|
-
ref?: undefined;
|
|
27
|
-
label?: undefined;
|
|
28
|
-
worker?: undefined;
|
|
29
|
-
size?: undefined;
|
|
30
|
-
}>;
|
|
13
|
+
static pushEvent(event: string, data?: {}, ts?: number): false | undefined;
|
|
31
14
|
}
|
package/lib/Worker.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -15,61 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
6
|
exports.Worker = void 0;
|
|
16
7
|
const core_1 = require("@quatrain/core");
|
|
17
8
|
const os_1 = __importDefault(require("os"));
|
|
18
|
-
const fs_1 = __importDefault(require("fs"));
|
|
19
|
-
const path_1 = __importDefault(require("path"));
|
|
20
9
|
const axios_1 = __importDefault(require("axios"));
|
|
21
10
|
const child_process_1 = require("child_process");
|
|
22
11
|
class Worker extends core_1.Core {
|
|
23
|
-
static log(message, src = 'Worker') {
|
|
24
|
-
super.log(message, src);
|
|
25
|
-
}
|
|
26
|
-
static prepare(folder) {
|
|
27
|
-
Worker.log(`Setting up process folder ${folder}`);
|
|
28
|
-
this.removeFolder(folder);
|
|
29
|
-
fs_1.default.mkdirSync(folder);
|
|
30
|
-
fs_1.default.mkdirSync(folder + path_1.default.sep + 'images');
|
|
31
|
-
fs_1.default.mkdirSync(folder + path_1.default.sep + 'vecto');
|
|
32
|
-
}
|
|
33
|
-
static makeFolder(folder) {
|
|
34
|
-
fs_1.default.mkdirSync(folder);
|
|
35
|
-
}
|
|
36
|
-
static removeFolder(folder) {
|
|
37
|
-
if (fs_1.default.existsSync(folder)) {
|
|
38
|
-
fs_1.default.readdirSync(folder).forEach((element) => {
|
|
39
|
-
const item = path_1.default.join(folder, element);
|
|
40
|
-
if (fs_1.default.lstatSync(item).isDirectory()) {
|
|
41
|
-
this.removeFolder(item);
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
fs_1.default.unlinkSync(item);
|
|
45
|
-
}
|
|
46
|
-
});
|
|
47
|
-
fs_1.default.rmdirSync(folder);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
static downloadFile(url, filepath) {
|
|
51
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
-
try {
|
|
53
|
-
const writer = fs_1.default.createWriteStream(filepath);
|
|
54
|
-
const response = yield axios_1.default.get(url, {
|
|
55
|
-
responseType: 'stream',
|
|
56
|
-
});
|
|
57
|
-
response.data.pipe(writer);
|
|
58
|
-
return new Promise((resolve, reject) => {
|
|
59
|
-
writer.on('finish', resolve);
|
|
60
|
-
writer.on('error', reject);
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
catch (error) {
|
|
64
|
-
console.error(`Download error: ${error.message}`);
|
|
65
|
-
throw error;
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
static safeString(name) {
|
|
70
|
-
return name.replace(/\s+/g, '_');
|
|
71
|
-
}
|
|
72
12
|
static pushEvent(event, data = {}, ts = 0) {
|
|
13
|
+
if (!this.endpoint) {
|
|
14
|
+
Worker.log(`Events endpoint is not set, can't send update!`);
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
73
17
|
ts = ts === Date.now() ? Date.now() + 1 : Date.now();
|
|
74
18
|
const payload = Object.assign(Object.assign({ event, worker: `Container ${os_1.default.hostname}`, os: `${os_1.default.type} ${os_1.default.release} (${os_1.default.platform} ${os_1.default.arch})` }, data), { ts });
|
|
75
19
|
axios_1.default
|
|
@@ -77,34 +21,6 @@ class Worker extends core_1.Core {
|
|
|
77
21
|
.then((res) => Worker.log(`Event pushed to backend: ${res.statusText}`))
|
|
78
22
|
.catch((err) => Worker.log(`Failed to push event to backend: ${err}`));
|
|
79
23
|
}
|
|
80
|
-
static pushFile(filepath, folder, extension = 'zip') {
|
|
81
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
82
|
-
try {
|
|
83
|
-
const filename = filepath.split('/').pop();
|
|
84
|
-
const destination = `${folder}.${extension}`;
|
|
85
|
-
// const storage = new Storage({
|
|
86
|
-
// keyFilename: params.keyFilename,
|
|
87
|
-
// })
|
|
88
|
-
// const bucket = storage.bucket(params.storageBucket)
|
|
89
|
-
// console.log(`Uploading ${filepath} to ${destination}`)
|
|
90
|
-
// const {
|
|
91
|
-
// 0: { metadata },
|
|
92
|
-
// } = await bucket.upload(filepath, {
|
|
93
|
-
// destination,
|
|
94
|
-
// resumable: false,
|
|
95
|
-
// })
|
|
96
|
-
return {
|
|
97
|
-
ref: destination,
|
|
98
|
-
label: filename,
|
|
99
|
-
worker: `Container ${os_1.default.hostname}`,
|
|
100
|
-
size: 0, //parseInt(metadata.size),
|
|
101
|
-
};
|
|
102
|
-
}
|
|
103
|
-
catch (err) {
|
|
104
|
-
return {};
|
|
105
|
-
}
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
24
|
}
|
|
109
25
|
exports.Worker = Worker;
|
|
110
26
|
Worker.endpoint = '';
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Worker = void 0;
|
|
3
|
+
exports.FileSystem = exports.Worker = void 0;
|
|
4
4
|
const Worker_1 = require("./Worker");
|
|
5
5
|
Object.defineProperty(exports, "Worker", { enumerable: true, get: function () { return Worker_1.Worker; } });
|
|
6
|
+
const FileSystem_1 = require("./FileSystem");
|
|
7
|
+
Object.defineProperty(exports, "FileSystem", { enumerable: true, get: function () { return FileSystem_1.FileSystem; } });
|
package/package.json
CHANGED
|
@@ -1,37 +1,39 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
2
|
+
"name": "@quatrain/worker",
|
|
3
|
+
"version": "1.1.7",
|
|
4
|
+
"description": "Container Worker helpers",
|
|
5
|
+
"main": "lib/index.js",
|
|
6
|
+
"types": "lib/index.d.ts",
|
|
7
|
+
"files": [
|
|
8
|
+
"lib/",
|
|
9
|
+
"README.md"
|
|
10
|
+
],
|
|
11
|
+
"author": "Quatrain Développement SAS <developers@quatrain.com>",
|
|
12
|
+
"license": "MIT",
|
|
13
|
+
"devDependencies": {
|
|
14
|
+
"@tsconfig/recommended": "^1.0.1",
|
|
15
|
+
"@types/fs-extra": "^11.0.4",
|
|
16
|
+
"@types/jest": "^27.0.3",
|
|
17
|
+
"@types/node": "^22.9.0",
|
|
18
|
+
"@types/object-hash": "^3.0.6",
|
|
19
|
+
"jest": "^27.4.7",
|
|
20
|
+
"jest-node-exports-resolver": "^1.1.6",
|
|
21
|
+
"trace-unhandled": "^2.0.1",
|
|
22
|
+
"ts-jest": "^27.1.2",
|
|
23
|
+
"ts-node": "^10.4.0",
|
|
24
|
+
"typescript": "^5.1.5"
|
|
25
|
+
},
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"@quatrain/core": "^1.1.7",
|
|
28
|
+
"axios": "^1.7.7",
|
|
29
|
+
"fs-extra": "^11.2.0"
|
|
30
|
+
},
|
|
31
|
+
"scripts": {
|
|
32
|
+
"test": "tsc && jest --verbose",
|
|
33
|
+
"build": "tsc",
|
|
34
|
+
"wbuild": "tsc --watch",
|
|
35
|
+
"bump-to": "yarn version",
|
|
36
|
+
"patch": "yarn version --patch --no-git-tag-version",
|
|
37
|
+
"publish": "yarn build && yarn npm publish --access public"
|
|
38
|
+
}
|
|
39
|
+
}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { QueueParameters } from './types/QueueParameters';
|
|
2
|
-
export declare abstract class AbstractQueueAdapter {
|
|
3
|
-
protected _params: QueueParameters;
|
|
4
|
-
protected _client: any;
|
|
5
|
-
constructor(params: QueueParameters);
|
|
6
|
-
abstract send(data: any, topic: string): Promise<string>;
|
|
7
|
-
abstract listen(topic: string): any;
|
|
8
|
-
}
|