wirejs-resources 0.1.147-llm → 0.1.149-llm

package/dist/hosting/client.d.ts

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

package/dist/hosting/client.js

@@ -0,0 +1,68 @@
+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

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

package/dist/internal/client.js

@@ -0,0 +1,68 @@
+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/resources/secret.d.ts

@@ -1,7 +1,13 @@
 import { Resource } from '../resource.js';
 export declare class Secret extends Resource {
-    #private;
     constructor(scope: Resource | string, id: string);
-    read(): Promise<any>;
-    write(data: any): Promise<void>;
+    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;
 }

package/dist/resources/secret.js

@@ -1,28 +1,38 @@
-import crypto from 'crypto';
+import * as crypto from 'crypto';
 import { Resource } from '../resource.js';
-import { FileService } from '../services/file.js';
+import { KeyValueStore } from './key-value-store.js';
 import { overrides } from '../overrides.js';
-const FILENAME = 'secret';
+let secrets;
 export class Secret extends Resource {
-    #fileService;
-    #initPromise;
     constructor(scope, id) {
         super(scope, id);
-        this.#fileService = new (overrides.FileService || FileService)(this, 'files');
-    }
-    #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;
+        secrets = new (overrides.KeyValueStore || KeyValueStore)('wirejs', 'secrets');
     }
     async read() {
-        await this.#initialize();
-        return JSON.parse(await this.#fileService.read(FILENAME));
+        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 });
+    }
+    async *scan() {
+        return secrets?.scan();
     }
-    async write(data) {
-        await this.#initialize();
-        await this.#fileService.write(FILENAME, JSON.stringify(data));
+    isAlreadyExistsError(error) {
+        return secrets?.isAlreadyExistsError(error);
     }
 }

package/dist/services/llm.d.ts

@@ -12,17 +12,22 @@ export type ContinueConversationOptions = {
     history: LLMMessage[];
     onChunk?: (chunk: LLMChunk) => void | Promise<void>;
     timeoutSeconds?: number;
+    systemPrompt?: string;
+    models?: string[];
+    targetContextSize?: number;
 };
 export declare class LLM extends Resource {
     models: string[];
     systemPrompt: string | undefined;
+    targetContextSize: number;
     constructor(scope: Resource | string, id: string, options: {
         models: string[];
         systemPrompt?: string;
+        targetContextSize?: number;
     });
     private stream;
     private checkOllamaAvailable;
     private checkModelExists;
     private createStreamedString;
-    continueConversation({ history, onChunk, timeoutSeconds }: ContinueConversationOptions): Promise<LLMMessage>;
+    continueConversation({ history, onChunk, timeoutSeconds, systemPrompt, targetContextSize, models, }: ContinueConversationOptions): Promise<LLMMessage>;
 }

package/dist/services/llm.js

@@ -2,10 +2,12 @@ import { Resource } from '../resource.js';
 export class LLM extends Resource {
     models;
     systemPrompt;
+    targetContextSize;
     constructor(scope, id, options) {
         super(scope, id);
         this.models = options.models;
         this.systemPrompt = options.systemPrompt;
+        this.targetContextSize = options.targetContextSize ?? 16384;
     }
     async stream(response, onChunk) {
         if (!response.ok || !response.body) {
@@ -77,7 +79,7 @@ export class LLM extends Resource {
             content: message
         };
     }
-    async continueConversation({ history, onChunk, timeoutSeconds }) {
+    async continueConversation({ history, onChunk, timeoutSeconds, systemPrompt, targetContextSize, models, }) {
         const ollamaAvailable = await this.checkOllamaAvailable();
         if (!ollamaAvailable) {
             return this.createStreamedString('Ollama is not running locally. Please install and start Ollama:\n\n' +
@@ -87,7 +89,7 @@ export class LLM extends Resource {
                 'Models to try installing: ' + this.models.join(', '), onChunk);
         }
         // models should be in priority order. so, first one that works is the one we want.
-        for (const model of this.models) {
+        for (const model of models ?? this.models) {
             const modelExists = await this.checkModelExists(model);
             if (!modelExists)
                 continue;
@@ -99,6 +101,7 @@ export class LLM extends Resource {
                     controller.abort();
                 }, timeoutSeconds * 1000);
             }
+            const finalSystemPrompt = systemPrompt ?? this.systemPrompt;
             try {
                 const response = await fetch('http://localhost:11434/api/chat', {
                     method: 'POST',
@@ -106,15 +109,18 @@ export class LLM extends Resource {
                     body: JSON.stringify({
                         model: model,
                         messages: [
-                            ...(this.systemPrompt ? [
+                            ...(finalSystemPrompt ? [
                                 {
                                     role: 'system',
-                                    content: this.systemPrompt
+                                    content: finalSystemPrompt
                                 }
                             ] : []),
                             ...history
                         ],
                         stream,
+                        options: {
+                            num_ctx: targetContextSize ?? this.targetContextSize
+                        }
                     }),
                     signal: controller.signal
                 });

package/dist/setup/index.d.ts

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

package/dist/setup/index.js

@@ -0,0 +1,27 @@
+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'));
+}

package/package.json

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