utilitas 1999.1.57 → 1999.1.58

package/lib/gen.mjs

@@ -1,9 +1,12 @@
+import {
+    ensureString, log as _log, need, throwError, tryUntil,
+} from './utilitas.mjs';
+
 import { convert, MIME_PNG } from './storage.mjs';
-import { ensureString, need, throwError, tryUntil } from './utilitas.mjs';
 import { assertCommand, exec } from './shell.mjs';
 
 const _NEED = ['OpenAI'];
-
+const log = (cnt, opt) => _log(cnt, import.meta.url, { time: 1, ...opt || {} });
 const [
     clients, OPENAI, GEMINI, BASE64, BUFFER, ERROR_GENERATING, IMAGEN_MODEL,
     OPENAI_MODEL, VEO_MODEL,
@@ -119,7 +122,7 @@ const getGeminiAccessToken = async (credentials) => {
     return tokResp;
 };
 
-const getGeminiVideo = async (jobId) => {
+const getGeminiVideo = async (jobId, accessToken) => {
     const client = clients?.[GEMINI];
     assert(client, 'No available video generation provider.');
     const resp = await (await fetch(
@@ -128,16 +131,12 @@ const getGeminiVideo = async (jobId) => {
         + `${VEO_MODEL}:fetchPredictOperation`, {
         method: 'POST', headers: {
             'Content-Type': 'application/json',
-            'Authorization': `Bearer ${client.accessToken}`,
-        },
-        body: JSON.stringify({
-            operationName: jobId,
-        })
+            'Authorization': `Bearer ${accessToken}`,
+        }, body: JSON.stringify({ operationName: jobId })
     })).json();
-    assert(
-        resp?.response?.videos?.length,
-        `Waiting for Gemini video generation: \`${jobId}\`...`
-    );
+    assert(resp?.response?.videos?.length,
+        'Waiting for Gemini video generation: '
+        + jobId.replace(/^.*\/([^/]+)$/, '$1'));
     return resp?.response?.videos;
 };
 
@@ -181,10 +180,9 @@ const generateVideo = async (prompt, options) => {
                 resp?.error?.message || ERROR_GENERATING
             );
             if (options?.generateRaw) { return resp; }
-            var videos = await tryUntil(
-                async () => await getGeminiVideo(resp.name),
-                { maxTry: 60 * 10, log: true }
-            );
+            var videos = await tryUntil(async () => await getGeminiVideo(
+                resp.name, accessToken
+            ), { maxTry: 60 * 10, log });
             assert(videos?.length, 'Failed to generate Gemini video.');
             if (options?.videoRaw) { return videos; }
             return await Promise.all(videos.map(async x => ({

package/lib/manifest.mjs

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

package/lib/utilitas.mjs

@@ -394,6 +394,7 @@ const log = (content, filename, options) => {
     const args = ['[' + color.red(name) + color.yellow(strTime) + ']'
         + (isErr ? '' : ` ${content}`)];
     if (isErr) { args.push(content); }
+    if (options?.return) { return args[0]; }
     return console.info.apply(null, args);
 };
 
@@ -669,12 +670,15 @@ const tryUntil = async (fnTry, options) => {
         interval: 1000 * 1, maxTry: Infinity, log: false, error: 'Operation failed.',
         verify: async (err, res) => { return !err; }, ...options || {}
     };
-    let [curTry, result, err] = [0, null, null];
+    let [curTry, result, err, msg] = [0, null, null, null];
     do {
         try {
             assert(await options.verify((err = null), (result = await fnTry())), options.error);
         } catch (e) {
-            (err = e) && options?.log && console.log(err?.message || err);
+            (err = e) && (msg = err?.message || err) && (
+                Function.isFunction(options?.log)
+                    ? await options.log(msg) : console.log(msg)
+            );
             await timeout(options.interval);
         }
     } while (++curTry < options.maxTry && err)

package/package.json

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