nuxt-ollama 1.2.26 → 1.3.1

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "1.2.26",
+  "version": "1.3.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, createResolver, addImportsDir, addServerImportsDir } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, addImportsDir, addServerImportsDir, addServerHandler } from '@nuxt/kit';
 import { defu } from 'defu';
 
 const module$1 = defineNuxtModule({
@@ -20,10 +20,13 @@ const module$1 = defineNuxtModule({
   setup(_options, _nuxt) {
     const resolver = createResolver(import.meta.url);
     const runtimeConfig = _nuxt.options.runtimeConfig;
-    const currentConfig = runtimeConfig.public.ollama ?? {};
-    runtimeConfig.public.ollama = defu(currentConfig, _options);
+    runtimeConfig.ollama = defu(runtimeConfig.ollama ?? {}, _options);
     addImportsDir(resolver.resolve("./runtime/composables"));
     addServerImportsDir(resolver.resolve("./runtime/server/utils"));
+    addServerHandler({
+      route: "/api/__ollama/**",
+      handler: resolver.resolve("./runtime/server/routes/ollama-proxy")
+    });
   }
 });
 

package/dist/runtime/composables/useOllama.js

@@ -1,15 +1,12 @@
 import { Ollama } from "ollama/browser";
-import { useRuntimeConfig } from "#imports";
+import { useRequestURL } from "#imports";
 export function useOllama() {
-  const options = useRuntimeConfig().public.ollama;
-  const headers = {};
-  if (options.api_key) {
-    headers.Authorization = `Bearer ${options.api_key}`;
-  }
-  const host = `${options.protocol}://${options.host}${options.port ? `:${options.port}` : ""}`;
+  const { origin } = useRequestURL();
   return new Ollama({
-    host,
-    proxy: options.proxy,
-    headers
+    host: origin,
+    fetch: (input, init) => {
+      const url = new URL(input.toString());
+      return fetch(`${origin}/api/__ollama${url.pathname}`, init);
+    }
   });
 }

package/dist/runtime/server/routes/ollama-proxy.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void | null>>;
+export default _default;

package/dist/runtime/server/routes/ollama-proxy.js

@@ -0,0 +1,32 @@
+import {
+  defineEventHandler,
+  getMethod,
+  getHeader,
+  readRawBody,
+  setResponseStatus,
+  setResponseHeader,
+  sendStream
+} from "h3";
+import { useRuntimeConfig } from "#imports";
+export default defineEventHandler(async (event) => {
+  const options = useRuntimeConfig().ollama;
+  const ollamaBase = `${options.protocol}://${options.host}${options.port ? `:${options.port}` : ""}`;
+  const subpath = event.path.replace(/^\/api\/__ollama/, "");
+  const headers = {};
+  const contentType = getHeader(event, "content-type");
+  if (contentType) headers["content-type"] = contentType;
+  if (options.api_key) {
+    headers["authorization"] = `Bearer ${options.api_key}`;
+  }
+  const body = await readRawBody(event);
+  const response = await fetch(`${ollamaBase}${subpath}`, {
+    method: getMethod(event),
+    headers,
+    body: body ?? void 0
+  });
+  setResponseStatus(event, response.status);
+  const responseContentType = response.headers.get("content-type");
+  if (responseContentType) setResponseHeader(event, "content-type", responseContentType);
+  if (!response.body) return null;
+  return sendStream(event, response.body);
+});

package/dist/runtime/server/utils/useOllama.js

@@ -1,7 +1,7 @@
 import { Ollama } from "ollama";
 import { useRuntimeConfig } from "#imports";
 export function useOllama() {
-  const options = useRuntimeConfig().public.ollama;
+  const options = useRuntimeConfig().ollama;
   const headers = {};
   if (options.api_key) {
     headers.Authorization = `Bearer ${options.api_key}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-ollama",
-  "version": "1.2.26",
+  "version": "1.3.1",
   "description": "Easy ollama integration for Nuxt",
   "repository": {
     "type": "git",
@@ -23,25 +23,25 @@
     "dist"
   ],
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.59.2",
-    "@typescript-eslint/parser": "^8.59.2",
+    "@typescript-eslint/eslint-plugin": "^8.61.1",
+    "@typescript-eslint/parser": "^8.61.1",
     "defu": "^6.1.7",
     "ollama": "^0.6.3"
   },
   "devDependencies": {
     "@nuxt/devtools": "^3.2.4",
-    "@nuxt/eslint-config": "^1.15.2",
-    "@nuxt/kit": "^4.4.4",
+    "@nuxt/eslint-config": "^1.16.0",
+    "@nuxt/kit": "^4.4.8",
     "@nuxt/module-builder": "^1.0.2",
-    "@nuxt/schema": "^4.4.4",
+    "@nuxt/schema": "^4.4.8",
     "@nuxt/test-utils": "^4.0.3",
     "@types/node": "latest",
     "changelogen": "^0.6.2",
-    "eslint": "^10.3.0",
-    "nuxt": "^4.4.4",
+    "eslint": "^10.5.0",
+    "nuxt": "^4.4.8",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.5",
-    "vue-tsc": "^3.2.8"
+    "vitest": "^4.1.9",
+    "vue-tsc": "^3.3.5"
   },
   "scripts": {
     "dev": "nuxi dev playground",