utilitas 1995.1.21 → 1995.1.23

package/lib/encryption.mjs

@@ -13,7 +13,8 @@ const _NEED = [
     '@google-cloud/speech',
     '@google-cloud/text-to-speech',
     '@google-cloud/vision',
-]
+    'google-gax',
+];
 
 const defaultAlgorithm = 'sha256';
 const defaultEncryption = 'aes-256-gcm';

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.1.21",
+    "version": "1995.1.23",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -17,17 +17,18 @@ const manifest = {
     },
     "dependencies": {
         "file-type": "^18.7.0",
-        "mathjs": "^12.0.0",
+        "mathjs": "^12.1.0",
         "uuid": "^9.0.1"
     },
     "devDependencies": {
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
         "@ffprobe-installer/ffprobe": "^2.1.2",
         "@google-cloud/speech": "^6.1.0",
+        "@google-cloud/storage": "^7.6.0",
         "@google-cloud/text-to-speech": "^5.0.1",
         "@google-cloud/vision": "^4.0.2",
         "@mozilla/readability": "^0.4.4",
-        "@sentry/node": "^7.80.0",
+        "@sentry/node": "^7.80.1",
         "@waylaidwanderer/chatgpt-api": "^1.37.3",
         "acme-client": "^5.0.0",
         "browserify-fs": "^1.0.0",
@@ -44,7 +45,7 @@ const manifest = {
         "node-mailjet": "^6.0.4",
         "node-polyfill-webpack-plugin": "^2.0.1",
         "office-text-extractor": "^3.0.2",
-        "openai": "^4.17.4",
+        "openai": "^4.19.0",
         "ping": "^0.4.4",
         "say": "^0.16.0",
         "telegraf": "^4.15.0",

package/lib/storage.mjs

@@ -12,8 +12,11 @@ import { homedir, tmpdir } from 'os';
 import { promisify } from 'util';
 import { v4 as uuidv4 } from 'uuid';
 
-const _NEED = ['mime-types'];
-const mapFilename = (name) => join(name.substr(0, 2), name.substr(2, 2));
+const _NEED = ['mime-types', '@google-cloud/storage'];
+const errorMessage = 'Invalid file.';
+const defaultMetadata = { cacheControl: 'public, max-age=31536000' };
+const getGcUrlByBucket = bucket => `https://storage.cloud.google.com/${bucket}`;
+const mapFilename = name => join(name.substr(0, 2), name.substr(2, 2));
 const [_zip, _unzip] = [__zip, __unzip].map(promisify);
 
 const [NULL, BASE64, BUFFER, FILE, STREAM, encoding, BINARY, mode, dirMode]
@@ -22,8 +25,12 @@ const [NULL, BASE64, BUFFER, FILE, STREAM, encoding, BINARY, mode, dirMode]
 const [encodeBase64, encodeBinary, encodeNull]
     = [{ encoding: BASE64 }, { encoding: BINARY }, { encoding: NULL }];
 
+let client = null;
+
 const readFile = async (name, options) => await fs.readFile(
-    name, options?.encoding === NULL ? null : (options?.encoding || encoding)
+    name, ['NULL', 'BUFFER'].includes(
+        ensureString(options?.encoding, { case: 'UP' })
+    ) ? null : (options?.encoding || encoding)
 );
 
 const writeFile = async (filename, data, options) => await fs.writeFile(
@@ -278,6 +285,50 @@ const tryRm = async (path, options) => await ignoreErrFunc(async () => {
     await fs.unlink(path);
 }, options);
 
+const init = async (options) => {
+    if (options) {
+        const provider = ensureString(options?.provider, { case: 'UP' });
+        switch (provider) {
+            case 'GOOGLE':
+                assert(
+                    options?.apiKey, 'Google Cloud API key is required.', 400
+                )
+                assert(
+                    options?.bucket,
+                    'Google Cloud Storage bucket is required.', 400
+                );
+                const url = trim(options?.url) || getGcUrlByBucket(options.bucket);
+                ~~process.env.FORKED === 1 && log(`GOOGLE CLOUD STORAGE: ${url}`);
+                const { Storage } = await need(
+                    '@google-cloud/storage', { raw: true }
+                );
+                client = new Storage({
+                    credentials: options.apiKey
+                }).bucket(options.bucket);
+                break;
+            default:
+                throwError('Invalid cloud storage provider.', 500);
+        }
+    }
+    assert(client, 'Cloud storage has not been initialized.', 501);
+    return client;
+};
+
+const uploadToCloud = async (data, options) => {
+    assert(client, 'Cloud storage has not been initialized.', 500);
+    const input = ensureString(options?.input, { case: 'UP' });
+    const file = await convert(data, {
+        input: options?.input, expected: FILE, errorMessage,
+        suffix: options?.suffix, ...options || {},
+    });
+    const raw = await client.upload(file, {
+        gzip: true, destination: options?.destination, metadata: defaultMetadata
+    });
+    const result = options?.raw ? raw : raw[0].metadata;
+    input !== FILE && await tryRm(file.path);
+    return result;
+};
+
 export {
     _NEED,
     analyzeFile,
@@ -287,8 +338,10 @@ export {
     exists,
     getConfig,
     getConfigFilename,
+    getGcUrlByBucket,
     getTempPath,
     handleError,
+    init,
     isTextFile,
     legalFilename,
     mapFilename,
@@ -300,6 +353,7 @@ export {
     touchPath,
     tryRm,
     unzip,
+    uploadToCloud,
     writeFile,
     writeJson,
     writeTempFile,

package/lib/vision.mjs

@@ -133,6 +133,24 @@ const read = async (image, options) => {
     return pages;
 };
 
+const read2 = async (image, options) => {
+    // assert(client, 'Vision API has not been initialized.', 500);
+    // const content = await convert(image, {
+    //     input: options?.input, expected: BASE64, errorMessage,
+    // });
+
+    // const [response] = await client.asyncBatchAnnotateFiles({
+    //     requests: [{
+    //         inputConfig: { mimeType: 'application/pdf', content },
+    //         features: [{ type: 'DOCUMENT_TEXT_DETECTION' }],
+    //         pages: [1, 2, 3, 4, 5], // max 5 pages
+    //     }],
+    // });
+    // let pages = response.responses[0].responses;
+    // options?.raw || (pages = pages.map(x => x.fullTextAnnotation.text));
+    // return pages;
+};
+
 export {
     _NEED,
     annotateImage,
@@ -141,5 +159,6 @@ export {
     ocrImageGoogle,
     ocrImageTesseract,
     read,
+    read2,
     see,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.1.21",
+    "version": "1995.1.23",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -28,17 +28,18 @@
     },
     "dependencies": {
         "file-type": "^18.7.0",
-        "mathjs": "^12.0.0",
+        "mathjs": "^12.1.0",
         "uuid": "^9.0.1"
     },
     "devDependencies": {
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
         "@ffprobe-installer/ffprobe": "^2.1.2",
         "@google-cloud/speech": "^6.1.0",
+        "@google-cloud/storage": "^7.6.0",
         "@google-cloud/text-to-speech": "^5.0.1",
         "@google-cloud/vision": "^4.0.2",
         "@mozilla/readability": "^0.4.4",
-        "@sentry/node": "^7.80.0",
+        "@sentry/node": "^7.80.1",
         "@waylaidwanderer/chatgpt-api": "^1.37.3",
         "acme-client": "^5.0.0",
         "browserify-fs": "^1.0.0",
@@ -55,7 +56,7 @@
         "node-mailjet": "^6.0.4",
         "node-polyfill-webpack-plugin": "^2.0.1",
         "office-text-extractor": "^3.0.2",
-        "openai": "^4.17.4",
+        "openai": "^4.19.0",
         "ping": "^0.4.4",
         "say": "^0.16.0",
         "telegraf": "^4.15.0",