utilitas 2001.1.102 → 2001.1.104

package/lib/alan.mjs

@@ -1360,9 +1360,10 @@ const talk = async (request, options = {}) => {
     // init
     const [sessionId, msgs, stream]
         = [options.sessionId || newSessionId(), {}, options.stream];
+    let result;
     await selectAi(options);
     // init functions
-    const packMsg = (opts) => ({
+    const packMsg = (opts) => result = {
         text: Object.values(msgs).find(x => x.text) ? joinL2(options.aiId.map(n => {
             if (msgs[n]?.ignored) { return null };
             const ai = ais.find(x => x.id === n);
@@ -1379,7 +1380,7 @@ const talk = async (request, options = {}) => {
         videos: Object.values(msgs).map(x => (x.videos || []).map(y => caption(y, FEATURE_ICONS.video, x.model))).flat(),
         annotations: Object.values(msgs).map(x => x.annotations || []).flat(),
         models: Object.values(msgs).map(x => x.model),
-    });
+    };
     const multiStream = async (ai, r, opts) => {
         ai && r && (msgs[ai] = r);
         stream && await stream(packMsg(opts));
@@ -1414,12 +1415,12 @@ const talk = async (request, options = {}) => {
     request && response && session.messages.push(chat);
     await setSession(sessionId, session, options);
     // tts
-    if ((options?.tts || session?.config?.tts) && response
+    if ((options?.tts || session?.config?.tts) && result?.spoken
         && Object.values(msgs).find(x => !x.audio?.length)) {
         await ignoreErrFunc(async () => {
             const ttsAi = await getAi(null, { select: { audio: true, fast: true } });
             await multiStream(ttsAi.id, {
-                ...await tts(response, { aiId: ttsAi.id, raw: true }),
+                ...await tts(result?.spoken, { aiId: ttsAi.id, raw: true }),
                 text: FEATURE_ICONS.audio, hidden: true,
             }, { processing: true });
         }, LOG);

package/lib/manifest.mjs

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

package/lib/utilitas.mjs

@@ -850,12 +850,14 @@ const getLockKey = key => {
 };
 
 const lock = async (key, options) => {
-    key = getLockKey(key);
-    while (new Date().getTime() - parseInt(LOCKS?.[key] || 0)
-        < (options?.timeout || 1000)) {
+    const stdKey = getLockKey(key);
+    while (new Date().getTime() < parseInt(LOCKS?.[stdKey] || 0)) {
         await timeout(options?.checkInterval || 1000);
     }
-    return (LOCKS[key] = new Date().getTime());
+    return {
+        time: LOCKS[stdKey] = new Date().getTime() + (options?.timeout || 1000),
+        unlock: () => unlock(key),
+    };
 };
 
 export {

package/package.json

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