@silkweave/fastify 1.3.0 → 1.3.2

package/.turbo/turbo-build.log

@@ -1,18 +1,17 @@
-
-
-> @silkweave/fastify@1.3.0 build /Users/atomic/projects/ai/silkweave/packages/fastify
-> tsup
-
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v8.5.1
-CLI Using tsup config: /Users/atomic/projects/ai/silkweave/packages/fastify/tsup.config.ts
-CLI Target: es2022
-CLI Cleaning output folder
-ESM Build start
-ESM build/index.js     4.95 KB
-ESM build/index.js.map 8.98 KB
-ESM ⚡️ Build success in 9ms
-DTS Build start
-DTS ⚡️ Build success in 975ms
-DTS build/index.d.ts 455.00 B
+
+> @silkweave/fastify@1.3.1 build /Users/atomic/projects/ai/silkweave/packages/fastify
+> tsup
+
+CLI Building entry: src/index.ts
+CLI Using tsconfig: tsconfig.json
+CLI tsup v8.5.1
+CLI Using tsup config: /Users/atomic/projects/ai/silkweave/packages/fastify/tsup.config.ts
+CLI Target: es2022
+CLI Cleaning output folder
+ESM Build start
+ESM build/index.js     5.31 KB
+ESM build/index.js.map 10.01 KB
+ESM ⚡️ Build success in 6ms
+DTS Build start
+DTS ⚡️ Build success in 898ms
+DTS build/index.d.ts 455.00 B

package/.turbo/turbo-check.log

@@ -1,13 +1,12 @@
-
-
-> @silkweave/fastify@1.3.0 check /Users/atomic/projects/ai/silkweave/packages/fastify
-> pnpm lint && pnpm typecheck
-
-
-> @silkweave/fastify@1.3.0 lint /Users/atomic/projects/ai/silkweave/packages/fastify
-> eslint
-
-
-> @silkweave/fastify@1.3.0 typecheck /Users/atomic/projects/ai/silkweave/packages/fastify
-> tsc --noEmit
-
+
+> @silkweave/fastify@1.3.1 check /Users/atomic/projects/ai/silkweave/packages/fastify
+> pnpm lint && pnpm typecheck
+
+
+> @silkweave/fastify@1.3.1 lint /Users/atomic/projects/ai/silkweave/packages/fastify
+> eslint
+
+
+> @silkweave/fastify@1.3.1 typecheck /Users/atomic/projects/ai/silkweave/packages/fastify
+> tsc --noEmit
+

package/.turbo/turbo-lint.log

@@ -1,6 +1,5 @@
 
 
-> @silkweave/fastify@1.3.0 lint /Users/atomic/projects/ai/silkweave/packages/fastify
+> @silkweave/fastify@1.3.1 lint /Users/atomic/projects/ai/silkweave/packages/fastify
 > eslint
 
- ELIFECYCLE  Command failed.

package/.turbo/turbo-prepack.log

@@ -1,26 +1,26 @@
 
 
-> @silkweave/fastify@1.3.0 prepack /Users/atomic/projects/ai/mcphero/packages/fastify
+> @silkweave/fastify@1.3.0 prepack /Users/atomic/projects/ai/silkweave/packages/fastify
 > pnpm clean && pnpm build
 
 
-> @silkweave/fastify@1.3.0 clean /Users/atomic/projects/ai/mcphero/packages/fastify
+> @silkweave/fastify@1.3.0 clean /Users/atomic/projects/ai/silkweave/packages/fastify
 > rimraf build
 
 
-> @silkweave/fastify@1.3.0 build /Users/atomic/projects/ai/mcphero/packages/fastify
+> @silkweave/fastify@1.3.0 build /Users/atomic/projects/ai/silkweave/packages/fastify
 > tsup
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.1
-CLI Using tsup config: /Users/atomic/projects/ai/mcphero/packages/fastify/tsup.config.ts
+CLI Using tsup config: /Users/atomic/projects/ai/silkweave/packages/fastify/tsup.config.ts
 CLI Target: es2022
 CLI Cleaning output folder
 ESM Build start
-ESM build/index.js     4.95 KB
-ESM build/index.js.map 8.98 KB
-ESM ⚡️ Build success in 6ms
+ESM build/index.js     5.54 KB
+ESM build/index.js.map 9.94 KB
+ESM ⚡️ Build success in 13ms
 DTS Build start
-DTS ⚡️ Build success in 782ms
+DTS ⚡️ Build success in 984ms
 DTS build/index.d.ts 455.00 B

package/README.md

@@ -1,6 +1,6 @@
 # @silkweave/fastify
 
-Fastify REST adapter for [Silkweave](https://github.com/atomicbi/silkweave) — expose your actions as a REST API with auto-generated OpenAPI/Swagger documentation.
+Fastify REST adapter for [Silkweave](https://github.com/silkweave/silkweave) — expose your actions as a REST API with auto-generated OpenAPI/Swagger documentation.
 
 ## Install
 
@@ -56,5 +56,5 @@ fastify({
 
 ## See Also
 
-- [Silkweave README](https://github.com/atomicbi/silkweave) — Full documentation
+- [Silkweave README](https://github.com/silkweave/silkweave) — Full documentation
 - [`@silkweave/core`](https://www.npmjs.com/package/@silkweave/core) — Core library

package/build/index.js

@@ -1,7 +1,9 @@
 // src/adapter/fastify.ts
 import { generateProtectedResourceMetadata, validateToken } from "@silkweave/auth";
+import { SilkweaveError } from "@silkweave/core";
 import { buildLogLevels } from "@silkweave/logger";
 import { fastify as fastifyInstance } from "fastify";
+import z from "zod";
 var PINO_LEVEL_MAP = {
   emergency: "fatal",
   alert: "fatal",
@@ -12,6 +14,75 @@ var PINO_LEVEL_MAP = {
   info: "info",
   debug: "debug"
 };
+function toOAuthReq(request) {
+  return {
+    method: request.method,
+    url: new URL(request.url, `http://${request.hostname}`),
+    headers: Object.fromEntries(Object.entries(request.headers).map(([k, v]) => [k, Array.isArray(v) ? v[0] : v])),
+    body: request.body
+  };
+}
+function sendOAuth(reply, oauthRes) {
+  for (const [key, value] of Object.entries(oauthRes.headers)) {
+    reply.header(key, value);
+  }
+  return reply.status(oauthRes.status).send(oauthRes.body);
+}
+function mountOAuthRoutes(instance, auth) {
+  const provider = auth.provider;
+  const paths = /* @__PURE__ */ new Set([
+    "/.well-known/oauth-authorization-server",
+    "/authorize",
+    "/auth/callback",
+    "/token",
+    "/register"
+  ]);
+  instance.get("/.well-known/oauth-authorization-server", async (_req, reply) => {
+    return sendOAuth(reply, provider.metadata());
+  });
+  instance.get("/authorize", async (req, reply) => {
+    return sendOAuth(reply, await provider.authorize(toOAuthReq(req)));
+  });
+  instance.get("/auth/callback", async (req, reply) => {
+    return sendOAuth(reply, await provider.callback(toOAuthReq(req)));
+  });
+  instance.post("/token", async (req, reply) => {
+    return sendOAuth(reply, await provider.token(toOAuthReq(req)));
+  });
+  instance.post("/register", async (req, reply) => {
+    return sendOAuth(reply, await provider.register(toOAuthReq(req)));
+  });
+  return paths;
+}
+function mountAuthMiddleware(instance, auth, oauthPaths) {
+  instance.decorateRequest("__silkweave_auth", void 0);
+  instance.addHook("onRequest", async (request, reply) => {
+    if (request.url.startsWith("/.well-known/") || oauthPaths.has(request.url.split("?")[0])) {
+      return;
+    }
+    const result = await validateToken(request.headers.authorization, auth);
+    if (result.error) {
+      for (const [key, value] of Object.entries(result.error.headers)) {
+        reply.header(key, value);
+      }
+      return reply.status(result.error.statusCode).send(result.error.body);
+    }
+    if (result.auth) {
+      request.__silkweave_auth = result.auth;
+    }
+  });
+}
+function createActionLogger(instance) {
+  return {
+    ...buildLogLevels((level, data) => {
+      const pinoLevel = PINO_LEVEL_MAP[level] ?? "info";
+      instance.log[pinoLevel](data);
+    }),
+    progress: ({ progress, total, message }) => {
+      instance.log.trace({ progress, total }, message);
+    }
+  };
+}
 var fastify = ({ host, port, auth, ...fastifyOptions }) => {
   const instance = fastifyInstance(fastifyOptions);
   return (options, baseContext) => {
@@ -34,60 +105,21 @@ var fastify = ({ host, port, auth, ...fastifyOptions }) => {
             return generateProtectedResourceMetadata(auth.resourceUrl, auth.authorizationServers);
           });
         }
-        const oauthPaths = /* @__PURE__ */ new Set();
-        if (auth?.provider) {
-          const provider = auth.provider;
-          const toOAuthReq = (request) => ({
-            method: request.method,
-            url: new URL(request.url, `http://${request.hostname}`),
-            headers: Object.fromEntries(Object.entries(request.headers).map(([k, v]) => [k, Array.isArray(v) ? v[0] : v])),
-            body: request.body
-          });
-          const sendOAuth = (reply, oauthRes) => {
-            for (const [key, value] of Object.entries(oauthRes.headers)) {
-              reply.header(key, value);
-            }
-            return reply.status(oauthRes.status).send(oauthRes.body);
-          };
-          oauthPaths.add("/.well-known/oauth-authorization-server");
-          oauthPaths.add("/authorize");
-          oauthPaths.add("/auth/callback");
-          oauthPaths.add("/token");
-          oauthPaths.add("/register");
-          instance.get("/.well-known/oauth-authorization-server", async (_req, reply) => {
-            return sendOAuth(reply, provider.metadata());
-          });
-          instance.get("/authorize", async (req, reply) => {
-            return sendOAuth(reply, await provider.authorize(toOAuthReq(req)));
-          });
-          instance.get("/auth/callback", async (req, reply) => {
-            return sendOAuth(reply, await provider.callback(toOAuthReq(req)));
-          });
-          instance.post("/token", async (req, reply) => {
-            return sendOAuth(reply, await provider.token(toOAuthReq(req)));
-          });
-          instance.post("/register", async (req, reply) => {
-            return sendOAuth(reply, await provider.register(toOAuthReq(req)));
-          });
-        }
+        const oauthPaths = auth?.provider ? mountOAuthRoutes(instance, auth) : /* @__PURE__ */ new Set();
         if (auth) {
-          instance.decorateRequest("__silkweave_auth", void 0);
-          instance.addHook("onRequest", async (request, reply) => {
-            if (request.url.startsWith("/.well-known/") || oauthPaths.has(request.url.split("?")[0])) {
-              return;
-            }
-            const result = await validateToken(request.headers.authorization, auth);
-            if (result.error) {
-              for (const [key, value] of Object.entries(result.error.headers)) {
-                reply.header(key, value);
-              }
-              return reply.status(result.error.statusCode).send(result.error.body);
-            }
-            if (result.auth) {
-              request.__silkweave_auth = result.auth;
-            }
-          });
+          mountAuthMiddleware(instance, auth, oauthPaths);
         }
+        instance.setErrorHandler((error, _request, reply) => {
+          if (error instanceof SilkweaveError) {
+            return reply.status(error.statusCode).send({ error: error.code, message: error.message });
+          }
+          if (error instanceof z.ZodError) {
+            return reply.status(400).send({ error: "validation_error", issues: error.issues });
+          }
+          instance.log.error(error);
+          return reply.status(500).send({ error: "internal", message: "Internal server error" });
+        });
+        const logger = createActionLogger(instance);
         for (const action of actions) {
           const schema = action.input.toJSONSchema();
           instance.post(`/${action.name}`, {
@@ -103,15 +135,6 @@ var fastify = ({ host, port, auth, ...fastifyOptions }) => {
               }
             }
           }, (request) => {
-            const logger = {
-              ...buildLogLevels((level, data) => {
-                const pinoLevel = PINO_LEVEL_MAP[level] ?? "info";
-                instance.log[pinoLevel](data);
-              }),
-              progress: ({ progress, total, message }) => {
-                instance.log.trace({ progress, total }, message);
-              }
-            };
             const authInfo = auth ? request.__silkweave_auth : void 0;
             return action.run(request.body, context.fork({ logger, request, ...authInfo ? { auth: authInfo } : {} }));
           });

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter/fastify.ts"],"sourcesContent":["import { AuthConfig, AuthInfo, generateProtectedResourceMetadata, OAuthRequest, OAuthResponse, validateToken } from '@silkweave/auth'\nimport { AdapterFactory } from '@silkweave/core'\nimport { buildLogLevels, Logger, LogLevel } from '@silkweave/logger'\nimport { FastifyBaseLogger, FastifyHttpOptions, fastify as fastifyInstance, FastifyReply, FastifyRequest } from 'fastify'\nimport { Server } from 'http'\n\ntype FastifyLogLevel = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace'\n\nconst PINO_LEVEL_MAP: Record<LogLevel, FastifyLogLevel> = {\n  emergency: 'fatal',\n  alert: 'fatal',\n  critical: 'fatal',\n  error: 'error',\n  warning: 'warn',\n  notice: 'debug',\n  info: 'info',\n  debug: 'debug'\n}\n\nexport interface FastifyAdapterOptions extends FastifyHttpOptions<Server, FastifyBaseLogger> {\n  host?: string\n  port?: number\n  auth?: AuthConfig\n}\n\nexport const fastify: AdapterFactory<FastifyAdapterOptions> = ({ host, port, auth, ...fastifyOptions }) => {\n  const instance = fastifyInstance(fastifyOptions)\n  return (options, baseContext) => {\n    const context = baseContext.fork({ adapter: 'fastify' })\n    return {\n      context,\n      start: async (actions) => {\n        await instance.register(import('@fastify/swagger'), {\n          openapi: {\n            info: {\n              title: options.name,\n              description: options.description,\n              version: options.version\n            }\n          }\n        })\n        await instance.register(import('@scalar/fastify-api-reference'), { routePrefix: '/' as `/${string}` })\n\n        if (auth?.authorizationServers?.length && auth.resourceUrl) {\n          instance.get('/.well-known/oauth-protected-resource', () => {\n            return generateProtectedResourceMetadata(auth.resourceUrl!, auth.authorizationServers!)\n          })\n        }\n\n        const oauthPaths = new Set<string>()\n        if (auth?.provider) {\n          const provider = auth.provider\n          const toOAuthReq = (request: FastifyRequest): OAuthRequest => ({\n            method: request.method,\n            url: new URL(request.url, `http://${request.hostname}`),\n            headers: Object.fromEntries(Object.entries(request.headers).map(([k, v]) => [k, Array.isArray(v) ? v[0] : v])),\n            body: request.body as Record<string, string> | undefined\n          })\n          const sendOAuth = (reply: FastifyReply, oauthRes: OAuthResponse) => {\n            for (const [key, value] of Object.entries(oauthRes.headers)) { reply.header(key, value) }\n            return reply.status(oauthRes.status).send(oauthRes.body)\n          }\n\n          oauthPaths.add('/.well-known/oauth-authorization-server')\n          oauthPaths.add('/authorize')\n          oauthPaths.add('/auth/callback')\n          oauthPaths.add('/token')\n          oauthPaths.add('/register')\n\n          instance.get('/.well-known/oauth-authorization-server', async (_req, reply) => {\n            return sendOAuth(reply, provider.metadata())\n          })\n          instance.get('/authorize', async (req, reply) => {\n            return sendOAuth(reply, await provider.authorize(toOAuthReq(req)))\n          })\n          instance.get('/auth/callback', async (req, reply) => {\n            return sendOAuth(reply, await provider.callback(toOAuthReq(req)))\n          })\n          instance.post('/token', async (req, reply) => {\n            return sendOAuth(reply, await provider.token(toOAuthReq(req)))\n          })\n          instance.post('/register', async (req, reply) => {\n            return sendOAuth(reply, await provider.register(toOAuthReq(req)))\n          })\n        }\n\n        if (auth) {\n          instance.decorateRequest('__silkweave_auth', undefined)\n          instance.addHook('onRequest', async (request: FastifyRequest, reply: FastifyReply) => {\n            if (request.url.startsWith('/.well-known/') || oauthPaths.has(request.url.split('?')[0])) { return }\n            const result = await validateToken(request.headers.authorization, auth)\n            if (result.error) {\n              for (const [key, value] of Object.entries(result.error.headers)) {\n                reply.header(key, value)\n              }\n              return reply.status(result.error.statusCode).send(result.error.body)\n            }\n            if (result.auth) {\n              (request as FastifyRequest & { __silkweave_auth?: AuthInfo }).__silkweave_auth = result.auth\n            }\n          })\n        }\n\n        for (const action of actions) {\n          const schema = action.input.toJSONSchema()\n          instance.post(`/${action.name}`, {\n            schema: {\n              description: action.description,\n              body: {\n                type: 'object',\n                properties: schema.properties,\n                required: schema.required\n              },\n              response: {\n                200: { description: 'Successful response' }\n              }\n            }\n          }, (request) => {\n            const logger: Logger = {\n              ...buildLogLevels((level, data) => {\n                const pinoLevel = PINO_LEVEL_MAP[level] ?? 'info'\n                instance.log[pinoLevel](data)\n              }),\n              progress: ({ progress, total, message }) => { instance.log.trace({ progress, total }, message) }\n            }\n            const authInfo = auth ? (request as FastifyRequest & { __silkweave_auth?: AuthInfo }).__silkweave_auth : undefined\n            return action.run(request.body, context.fork({ logger, request, ...(authInfo ? { auth: authInfo } : {}) }))\n          })\n        }\n        await instance.listen({ host, port })\n      },\n      stop: async () => { await instance.close() }\n    }\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/adapter/fastify.ts"],"sourcesContent":["import { AuthConfig, AuthInfo, generateProtectedResourceMetadata, OAuthRequest, OAuthResponse, validateToken } from '@silkweave/auth'\nimport { AdapterFactory, SilkweaveError } from '@silkweave/core'\nimport { buildLogLevels, Logger, LogLevel } from '@silkweave/logger'\nimport { FastifyBaseLogger, FastifyHttpOptions, fastify as fastifyInstance, FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'\nimport { Server } from 'http'\nimport z from 'zod'\n\ntype FastifyLogLevel = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace'\n\nconst PINO_LEVEL_MAP: Record<LogLevel, FastifyLogLevel> = {\n  emergency: 'fatal',\n  alert: 'fatal',\n  critical: 'fatal',\n  error: 'error',\n  warning: 'warn',\n  notice: 'debug',\n  info: 'info',\n  debug: 'debug'\n}\n\nexport interface FastifyAdapterOptions extends FastifyHttpOptions<Server, FastifyBaseLogger> {\n  host?: string\n  port?: number\n  auth?: AuthConfig\n}\n\nfunction toOAuthReq(request: FastifyRequest): OAuthRequest {\n  return {\n    method: request.method,\n    url: new URL(request.url, `http://${request.hostname}`),\n    headers: Object.fromEntries(Object.entries(request.headers).map(([k, v]) => [k, Array.isArray(v) ? v[0] : v])),\n    body: request.body as Record<string, string> | undefined\n  }\n}\n\nfunction sendOAuth(reply: FastifyReply, oauthRes: OAuthResponse) {\n  for (const [key, value] of Object.entries(oauthRes.headers)) { reply.header(key, value) }\n  return reply.status(oauthRes.status).send(oauthRes.body)\n}\n\nfunction mountOAuthRoutes(instance: FastifyInstance, auth: AuthConfig): Set<string> {\n  const provider = auth.provider!\n\n  const paths = new Set([\n    '/.well-known/oauth-authorization-server',\n    '/authorize',\n    '/auth/callback',\n    '/token',\n    '/register'\n  ])\n\n  instance.get('/.well-known/oauth-authorization-server', async (_req, reply) => {\n    return sendOAuth(reply, provider.metadata())\n  })\n  instance.get('/authorize', async (req, reply) => {\n    return sendOAuth(reply, await provider.authorize(toOAuthReq(req)))\n  })\n  instance.get('/auth/callback', async (req, reply) => {\n    return sendOAuth(reply, await provider.callback(toOAuthReq(req)))\n  })\n  instance.post('/token', async (req, reply) => {\n    return sendOAuth(reply, await provider.token(toOAuthReq(req)))\n  })\n  instance.post('/register', async (req, reply) => {\n    return sendOAuth(reply, await provider.register(toOAuthReq(req)))\n  })\n\n  return paths\n}\n\nfunction mountAuthMiddleware(instance: FastifyInstance, auth: AuthConfig, oauthPaths: Set<string>) {\n  instance.decorateRequest('__silkweave_auth', undefined)\n  instance.addHook('onRequest', async (request: FastifyRequest, reply: FastifyReply) => {\n    if (request.url.startsWith('/.well-known/') || oauthPaths.has(request.url.split('?')[0])) { return }\n    const result = await validateToken(request.headers.authorization, auth)\n    if (result.error) {\n      for (const [key, value] of Object.entries(result.error.headers)) {\n        reply.header(key, value)\n      }\n      return reply.status(result.error.statusCode).send(result.error.body)\n    }\n    if (result.auth) {\n      (request as FastifyRequest & { __silkweave_auth?: AuthInfo }).__silkweave_auth = result.auth\n    }\n  })\n}\n\nfunction createActionLogger(instance: FastifyInstance): Logger {\n  return {\n    ...buildLogLevels((level, data) => {\n      const pinoLevel = PINO_LEVEL_MAP[level] ?? 'info'\n      instance.log[pinoLevel](data)\n    }),\n    progress: ({ progress, total, message }) => { instance.log.trace({ progress, total }, message) }\n  }\n}\n\nexport const fastify: AdapterFactory<FastifyAdapterOptions> = ({ host, port, auth, ...fastifyOptions }) => {\n  const instance = fastifyInstance(fastifyOptions)\n  return (options, baseContext) => {\n    const context = baseContext.fork({ adapter: 'fastify' })\n    return {\n      context,\n      start: async (actions) => {\n        await instance.register(import('@fastify/swagger'), {\n          openapi: {\n            info: {\n              title: options.name,\n              description: options.description,\n              version: options.version\n            }\n          }\n        })\n        await instance.register(import('@scalar/fastify-api-reference'), { routePrefix: '/' as `/${string}` })\n\n        if (auth?.authorizationServers?.length && auth.resourceUrl) {\n          instance.get('/.well-known/oauth-protected-resource', () => {\n            return generateProtectedResourceMetadata(auth.resourceUrl!, auth.authorizationServers!)\n          })\n        }\n\n        const oauthPaths = auth?.provider ? mountOAuthRoutes(instance, auth) : new Set<string>()\n\n        if (auth) {\n          mountAuthMiddleware(instance, auth, oauthPaths)\n        }\n\n        instance.setErrorHandler((error, _request, reply) => {\n          if (error instanceof SilkweaveError) {\n            return reply.status(error.statusCode).send({ error: error.code, message: error.message })\n          }\n          if (error instanceof z.ZodError) {\n            return reply.status(400).send({ error: 'validation_error', issues: error.issues })\n          }\n          instance.log.error(error)\n          return reply.status(500).send({ error: 'internal', message: 'Internal server error' })\n        })\n\n        const logger = createActionLogger(instance)\n\n        for (const action of actions) {\n          const schema = action.input.toJSONSchema()\n          instance.post(`/${action.name}`, {\n            schema: {\n              description: action.description,\n              body: {\n                type: 'object',\n                properties: schema.properties,\n                required: schema.required\n              },\n              response: {\n                200: { description: 'Successful response' }\n              }\n            }\n          }, (request) => {\n            const authInfo = auth ? (request as FastifyRequest & { __silkweave_auth?: AuthInfo }).__silkweave_auth : undefined\n            return action.run(request.body, context.fork({ logger, request, ...(authInfo ? { auth: authInfo } : {}) }))\n          })\n        }\n        await instance.listen({ host, port })\n      },\n      stop: async () => { await instance.close() }\n    }\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@silkweave/fastify",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Silkweave Fastify REST Adapter",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/atomicbi/silkweave.git",
+    "url": "git+ssh://git@github.com/silkweave/silkweave.git",
     "directory": "packages/fastify"
   },
   "type": "module",
@@ -15,9 +15,9 @@
     "@scalar/fastify-api-reference": "^1.49.0",
     "fastify": "^5.8.2",
     "zod": "^4.3.6",
-    "@silkweave/core": "1.3.0",
-    "@silkweave/auth": "1.3.0",
-    "@silkweave/logger": "1.3.0"
+    "@silkweave/auth": "1.3.2",
+    "@silkweave/core": "1.3.2",
+    "@silkweave/logger": "1.3.2"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",