diff --git a/deno.json b/deno.json index 2ab24847..bc5d1e29 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,6 @@ { "$schema": "https://deno.land/x/deno@v1.41.0/cli/schemas/config-file.v1.json", + "version": "1.0.0", "tasks": { "start": "deno run -A src/server.ts", "dev": "deno run -A --watch src/server.ts", @@ -40,6 +41,7 @@ "@std/media-types": "jsr:@std/media-types@^0.224.1", "@std/streams": "jsr:@std/streams@^0.223.0", "comlink": "npm:comlink@^4.4.1", + "deno.json": "./deno.json", "deno-safe-fetch/load": "https://gitlab.com/soapbox-pub/deno-safe-fetch/-/raw/v1.0.0/load.ts", "entities": "npm:entities@^4.5.0", "fast-stable-stringify": "npm:fast-stable-stringify@^1.0.0", diff --git a/deno.lock b/deno.lock index b3a27ff0..f59adb73 100644 --- a/deno.lock +++ b/deno.lock @@ -43,6 +43,7 @@ "npm:entities@^4.5.0": "npm:entities@4.5.0", "npm:fast-stable-stringify@^1.0.0": "npm:fast-stable-stringify@1.0.0", "npm:formdata-helper@^0.3.0": "npm:formdata-helper@0.3.0", + "npm:hono-rate-limiter@^0.3.0": "npm:hono-rate-limiter@0.3.0_hono@4.2.5", "npm:iso-639-1@2.1.15": "npm:iso-639-1@2.1.15", "npm:isomorphic-dompurify@^2.11.0": "npm:isomorphic-dompurify@2.11.0", "npm:kysely@0.27.3": "npm:kysely@0.27.3", @@ -522,6 +523,16 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dependencies": {} }, + "hono-rate-limiter@0.3.0_hono@4.2.5": { + "integrity": "sha512-QUS1N+DCZs8CKjpoHugvEvAp/+e+LUllPPnaIlATK9GyT26niQxn4H4V+O5kHwcsXjD3P3JOc0jMb7fnW6gpFQ==", + "dependencies": { + "hono": "hono@4.2.5" + } + }, + "hono@4.2.5": { + "integrity": "sha512-uonJD3i/yy005kQ7bPZRVfG3rejYJwyPqBmPoUGijS4UB/qM+YlrZ7xzSWy+ByDu9buGHUG+f+SKzz03Y6V1Kw==", + "dependencies": {} + }, "html-encoding-sniffer@4.0.0": { "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", "dependencies": { diff --git a/src/controllers/api/instance.ts b/src/controllers/api/instance.ts index bda055dc..faca9c9f 100644 --- a/src/controllers/api/instance.ts +++ b/src/controllers/api/instance.ts @@ -1,9 +1,11 @@ +import denoJson from 'deno.json' with { type: 'json' }; + import { AppController } from '@/app.ts'; import { Conf } from '@/config.ts'; import { Storages } from '@/storages.ts'; import { getInstanceMetadata } from '@/utils/instance.ts'; -const version = '3.0.0 (compatible; Ditto 1.0.0)'; +const version = `3.0.0 (compatible; Ditto ${denoJson.version})`; const instanceV1Controller: AppController = async (c) => { const { host, protocol } = Conf.url; diff --git a/src/controllers/nostr/relay-info.ts b/src/controllers/nostr/relay-info.ts index 39224e87..9ee7babb 100644 --- a/src/controllers/nostr/relay-info.ts +++ b/src/controllers/nostr/relay-info.ts @@ -1,3 +1,5 @@ +import denoJson from 'deno.json' with { type: 'json' }; + import { AppController } from '@/app.ts'; import { Conf } from '@/config.ts'; import { Storages } from '@/storages.ts'; @@ -14,7 +16,7 @@ const relayInfoController: AppController = async (c) => { contact: meta.email, supported_nips: [1, 5, 9, 11, 16, 45, 50, 46, 98], software: 'Ditto', - version: '0.0.0', + version: denoJson.version, limitation: { auth_required: false, created_at_lower_limit: 0,