wirejs-resources 0.1.145-llm → 0.1.147-llm

package/dist/resources/secret.d.ts

@@ -1,13 +1,7 @@
 import { Resource } from '../resource.js';
 export declare class Secret extends Resource {
+    #private;
     constructor(scope: Resource | string, id: string);
-    read(): Promise<string>;
-    write(value: string, options?: {
-        onlyIfNotExists?: boolean;
-    }): Promise<void | undefined>;
-    scan(): AsyncGenerator<never, AsyncGenerator<{
-        key: string;
-        value: string;
-    }, any, any> | undefined, unknown>;
-    isAlreadyExistsError(error: any): boolean | undefined;
+    read(): Promise<any>;
+    write(data: any): Promise<void>;
 }

package/dist/resources/secret.js

@@ -1,38 +1,28 @@
-import * as crypto from 'crypto';
+import crypto from 'crypto';
 import { Resource } from '../resource.js';
-import { KeyValueStore } from './key-value-store.js';
+import { FileService } from '../services/file.js';
 import { overrides } from '../overrides.js';
-let secrets;
+const FILENAME = 'secret';
 export class Secret extends Resource {
+    #fileService;
+    #initPromise;
     constructor(scope, id) {
         super(scope, id);
-        secrets = new (overrides.KeyValueStore || KeyValueStore)('wirejs', 'secrets');
+        this.#fileService = new (overrides.FileService || FileService)(this, 'files');
     }
-    async read() {
-        const existingValue = await secrets?.get(this.absoluteId);
-        if (!existingValue) {
-            try {
-                const initValue = crypto.randomBytes(64).toString('base64url');
-                await this.write(initValue, { onlyIfNotExists: true });
-                return initValue;
-            }
-            catch (error) {
-                if (!this.isAlreadyExistsError(error))
-                    throw error;
-                return this.read();
-            }
-        }
-        else {
-            return existingValue;
-        }
-    }
-    async write(value, options) {
-        return secrets?.set(this.absoluteId, value, { onlyIfNotExists: options?.onlyIfNotExists });
+    #initialize() {
+        this.#initPromise = this.#initPromise || this.#fileService.write(FILENAME, JSON.stringify(crypto.randomBytes(64).toString('base64url')), { onlyIfNotExists: true }).catch(error => {
+            if (!this.#fileService.isAlreadyExistsError(error))
+                throw error;
+        });
+        return this.#initPromise;
     }
-    async *scan() {
-        return secrets?.scan();
+    async read() {
+        await this.#initialize();
+        return JSON.parse(await this.#fileService.read(FILENAME));
     }
-    isAlreadyExistsError(error) {
-        return secrets?.isAlreadyExistsError(error);
+    async write(data) {
+        await this.#initialize();
+        await this.#fileService.write(FILENAME, JSON.stringify(data));
     }
 }

package/dist/services/llm.d.ts

@@ -8,6 +8,11 @@ export type LLMChunk = {
     message: LLMMessage;
     done: boolean;
 };
+export type ContinueConversationOptions = {
+    history: LLMMessage[];
+    onChunk?: (chunk: LLMChunk) => void | Promise<void>;
+    timeoutSeconds?: number;
+};
 export declare class LLM extends Resource {
     models: string[];
     systemPrompt: string | undefined;
@@ -19,5 +24,5 @@ export declare class LLM extends Resource {
     private checkOllamaAvailable;
     private checkModelExists;
     private createStreamedString;
-    continueConversation(history: LLMMessage[], onChunk?: (chunk: LLMChunk) => void | Promise<void>): Promise<LLMMessage>;
+    continueConversation({ history, onChunk, timeoutSeconds }: ContinueConversationOptions): Promise<LLMMessage>;
 }

package/dist/services/llm.js

@@ -77,7 +77,7 @@ export class LLM extends Resource {
             content: message
         };
     }
-    async continueConversation(history, onChunk) {
+    async continueConversation({ history, onChunk, timeoutSeconds }) {
         const ollamaAvailable = await this.checkOllamaAvailable();
         if (!ollamaAvailable) {
             return this.createStreamedString('Ollama is not running locally. Please install and start Ollama:\n\n' +
@@ -92,31 +92,53 @@ export class LLM extends Resource {
             if (!modelExists)
                 continue;
             const stream = typeof onChunk === 'function';
-            const response = await fetch('http://localhost:11434/api/chat', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    model: model,
-                    messages: [
-                        ...(this.systemPrompt ? [
-                            {
-                                role: 'system',
-                                content: this.systemPrompt
-                            }
-                        ] : []),
-                        ...history
-                    ],
-                    stream,
-                })
-            });
-            if (response.ok) {
-                if (stream) {
-                    return this.stream(response, onChunk);
+            const controller = new AbortController();
+            let timeoutId;
+            if (timeoutSeconds) {
+                timeoutId = setTimeout(() => {
+                    controller.abort();
+                }, timeoutSeconds * 1000);
+            }
+            try {
+                const response = await fetch('http://localhost:11434/api/chat', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        model: model,
+                        messages: [
+                            ...(this.systemPrompt ? [
+                                {
+                                    role: 'system',
+                                    content: this.systemPrompt
+                                }
+                            ] : []),
+                            ...history
+                        ],
+                        stream,
+                    }),
+                    signal: controller.signal
+                });
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                }
+                if (response.ok) {
+                    if (stream) {
+                        return this.stream(response, onChunk);
+                    }
+                    else {
+                        const chunk = await response.json();
+                        return chunk.message;
+                    }
+                }
+            }
+            catch (error) {
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
                 }
-                else {
-                    const chunk = await response.json();
-                    return chunk.message;
+                if (error instanceof Error && error.name === 'AbortError') {
+                    throw new Error(`Request timed out after ${timeoutSeconds} seconds`);
                 }
+                throw error;
             }
         }
         // if nothing works, we want to tell the user (the dev) how to install the dep.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-resources",
-	"version": "0.1.145-llm",
+	"version": "0.1.147-llm",
 	"description": "Basic services and server-side resources for wirejs apps",
 	"type": "module",
 	"main": "./dist/index.js",

package/dist/hosting/client.d.ts

@@ -1 +0,0 @@
-export declare function apiTree(INTERNAL_API_URL: string, path?: string[]): () => void;

package/dist/hosting/client.js

@@ -1,68 +0,0 @@
-async function callApi(INTERNAL_API_URL, method, ...args) {
-    function isNode() {
-        return typeof args[0]?.cookies?.getAll === 'function';
-    }
-    function apiUrl() {
-        if (isNode()) {
-            return INTERNAL_API_URL;
-        }
-        else {
-            return "/api";
-        }
-    }
-    let cookieHeader = {};
-    if (isNode()) {
-        const context = args[0];
-        const cookies = context.cookies.getAll();
-        cookieHeader = typeof cookies === 'object'
-            ? {
-                Cookie: Object.entries(cookies).map(kv => kv.join('=')).join('; ')
-            }
-            : {};
-    }
-    const response = await fetch(apiUrl(), {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            ...cookieHeader
-        },
-        body: JSON.stringify([{ method, args: [...args] }]),
-    });
-    const body = await response.json();
-    if (isNode()) {
-        const context = args[0];
-        for (const c of response.headers.getSetCookie()) {
-            const parts = c.split(';').map(p => p.trim());
-            const flags = parts.slice(1);
-            const [name, value] = parts[0].split('=').map(decodeURIComponent);
-            const httpOnly = flags.includes('HttpOnly');
-            const secure = flags.includes('Secure');
-            const maxAgePart = flags.find(f => f.startsWith('Max-Age='))?.split('=')[1];
-            context.cookies.set({
-                name,
-                value,
-                httpOnly,
-                secure,
-                maxAge: maxAgePart ? parseInt(maxAgePart) : undefined
-            });
-        }
-    }
-    const error = body[0].error;
-    if (error) {
-        throw new Error(error);
-    }
-    const value = body[0].data;
-    return value;
-}
-;
-export function apiTree(INTERNAL_API_URL, path = []) {
-    return new Proxy(function () { }, {
-        apply(_target, _thisArg, args) {
-            return callApi(INTERNAL_API_URL, path, ...args);
-        },
-        get(_target, prop) {
-            return apiTree(INTERNAL_API_URL, [...path, prop]);
-        }
-    });
-}
-;

package/dist/internal/client.d.ts

@@ -1 +0,0 @@
-export declare function apiTree(INTERNAL_API_URL: string, path?: string[]): () => void;

package/dist/internal/client.js

@@ -1,68 +0,0 @@
-async function callApi(INTERNAL_API_URL, method, ...args) {
-    function isNode() {
-        return typeof args[0]?.cookies?.getAll === 'function';
-    }
-    function apiUrl() {
-        if (isNode()) {
-            return INTERNAL_API_URL;
-        }
-        else {
-            return "/api";
-        }
-    }
-    let cookieHeader = {};
-    if (isNode()) {
-        const context = args[0];
-        const cookies = context.cookies.getAll();
-        cookieHeader = typeof cookies === 'object'
-            ? {
-                Cookie: Object.entries(cookies).map(kv => kv.join('=')).join('; ')
-            }
-            : {};
-    }
-    const response = await fetch(apiUrl(), {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            ...cookieHeader
-        },
-        body: JSON.stringify([{ method, args: [...args] }]),
-    });
-    const body = await response.json();
-    if (isNode()) {
-        const context = args[0];
-        for (const c of response.headers.getSetCookie()) {
-            const parts = c.split(';').map(p => p.trim());
-            const flags = parts.slice(1);
-            const [name, value] = parts[0].split('=').map(decodeURIComponent);
-            const httpOnly = flags.includes('HttpOnly');
-            const secure = flags.includes('Secure');
-            const maxAgePart = flags.find(f => f.startsWith('Max-Age='))?.split('=')[1];
-            context.cookies.set({
-                name,
-                value,
-                httpOnly,
-                secure,
-                maxAge: maxAgePart ? parseInt(maxAgePart) : undefined
-            });
-        }
-    }
-    const error = body[0].error;
-    if (error) {
-        throw new Error(error);
-    }
-    const value = body[0].data;
-    return value;
-}
-;
-export function apiTree(INTERNAL_API_URL, path = []) {
-    return new Proxy(function () { }, {
-        apply(_target, _thisArg, args) {
-            return callApi(INTERNAL_API_URL, path, ...args);
-        },
-        get(_target, prop) {
-            return apiTree(INTERNAL_API_URL, [...path, prop]);
-        }
-    });
-}
-;

package/dist/setup/index.d.ts

@@ -1 +0,0 @@
-export declare function prebuildApi(): Promise<void>;

package/dist/setup/index.js

@@ -1,27 +0,0 @@
-import process from 'process';
-import fs from 'fs';
-import path from 'path';
-export async function prebuildApi() {
-    const CWD = process.cwd();
-    let API_URL = '/api';
-    const indexModule = await import(path.join(CWD, 'index.js'));
-    try {
-        const backendConfigModule = await import(path.join(CWD, 'config.js'));
-        const backendConfig = backendConfigModule.default;
-        console.log("backend config found", backendConfig);
-        if (backendConfig.apiUrl) {
-            API_URL = backendConfig.apiUrl;
-        }
-    }
-    catch {
-        console.log("No backend API config found.");
-    }
-    const apiCode = Object.keys(indexModule)
-        .map(k => `export const ${k} = apiTree(INTERNAL_API_URL, ${JSON.stringify([k])});`)
-        .join('\n');
-    const baseClient = [
-        `import { apiTree } from "wirejs-resources/hosting/client.js";`,
-        `const INTERNAL_API_URL = ${JSON.stringify(API_URL)};`,
-    ].join('\n');
-    await fs.promises.writeFile(path.join(CWD, 'index.client.js'), [baseClient, apiCode].join('\n\n'));
-}