utilitas 1995.2.3 → 1995.2.5

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.3",
+    "version": "1995.2.5",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/storage.mjs

@@ -16,7 +16,8 @@ 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 getGs = id => `gs://${id}`.replace(/[\/][^\/]*$/, '');
+const getGsById = id => `gs://${id}`.replace(/[\/][^\/]*$/, '');
+const getIdByGs = gs => gs.replace(/^gs:\/\/[^/]*\/(.*)$/, '$1');
 const mapFilename = name => join(name.substr(0, 2), name.substr(2, 2));
 const [_zip, _unzip] = [__zip, __unzip].map(promisify);
 const log = content => _log(content, import.meta.url);
@@ -349,7 +350,7 @@ const uploadToCloud = async (data, options) => {
     });
     const result = options?.raw ? raw : raw[0].metadata;
     input !== FILE && await tryRm(file.path);
-    !options?.raw && result && (result.gs = getGs(result?.id));
+    !options?.raw && result && (result.gs = getGsById(result?.id));
     return result;
 };
 
@@ -428,6 +429,7 @@ export {
     getConfig,
     getConfigFilename,
     getGcUrlByBucket,
+    getIdByGs,
     getTempPath,
     handleError,
     init,

package/lib/vision.mjs

@@ -1,7 +1,8 @@
 import { getApiKeyCredentials } from './encryption.mjs';
+import get from './shot.mjs';
 
 import {
-    convert, deleteOnCloud, downloadFromCloud, uploadToCloud,
+    convert, deleteOnCloud, downloadFromCloud, getIdByGs, uploadToCloud,
 } from './storage.mjs';
 
 import {
@@ -12,6 +13,7 @@ const _NEED = ['@google-cloud/vision', 'tesseract.js'];
 const [BASE64, BUFFER, FILE, DEFAULT_LANG] = ['BASE64', 'BUFFER', 'FILE', 'eng'];
 const ceil = num => num.toFixed(4);
 const errorMessage = 'Invalid image data.';
+const getTextFromBatch = bt => bt.responses.map(p => p.fullTextAnnotation.text);
 const log = content => _log(content, import.meta.url);
 
 let client;
@@ -125,16 +127,14 @@ const read = async (image, options) => {
     const content = await convert(image, {
         input: options?.input, expected: BASE64, errorMessage,
     });
-    const [response] = await client.batchAnnotateFiles({
+    let result = await client.batchAnnotateFiles({
         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;
+    return options?.raw ? result : getTextFromBatch(result[0].responses[0]);
 };
 
 const readAll = async (image, options) => {
@@ -145,7 +145,8 @@ const readAll = async (image, options) => {
     });
     const uri = result.upload?.gs;
     const destination = `${uri}_result/`;
-    result.clear = await deleteOnCloud(destination);
+    const resultId = getIdByGs(destination);
+    result.clear = await deleteOnCloud(resultId);
     result.submit = await client.asyncBatchAnnotateFiles({
         requests: [{
             inputConfig: { mimeType: 'application/pdf', gcsSource: { uri } },
@@ -154,20 +155,13 @@ const readAll = async (image, options) => {
         }],
     });
     result.response = await result.submit[0].promise();
-    result.result = await downloadFromCloud(
-        result.response[0].responses[0].outputConfig.gcsDestination.uri.replace(
-            /^gs:\/\/[^/]*\/(.*)$/, '$1'
-        ),
-        { expected: 'JSON' }
-    );
-    if (options?.raw) { return result; }
-    const pages = [];
-    for (let file in result.result) {
-        result.result[file].responses.map(x => pages.push(
-            x.fullTextAnnotation.text
-        ));
-    }
-    return pages;
+    result.result = await downloadFromCloud(resultId, { expected: 'JSON' });
+    options?.keep || (result.cleanup = await Promise.all(
+        [getIdByGs(uri), resultId].map(deleteOnCloud)
+    ));
+    return options?.raw ? result : Object.keys(result.result).map(
+        f => getTextFromBatch(result.result[f])
+    ).flat();
 };
 
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.3",
+    "version": "1995.2.5",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",