diff --git a/README.md b/README.md index 446fe31..d1b3c78 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ The `PdfService` is responsible for parsing PDF files and extracting their text ```typescript import * as fs from 'node:fs/promises'; -import { ServiceType, type IPdfService } from '@elizaos/core'; // Assuming ServiceType and IPdfService are available +import { ServiceType, type IPdfService } from '@elizaos/core-plugin-v2'; // Assuming ServiceType and IPdfService are available async function extractTextFromPdf(runtime: IAgentRuntime, filePath: string) { try { diff --git a/bun.lock b/bun.lock index 6a28c19..2f79b75 100644 --- a/bun.lock +++ b/bun.lock @@ -6,7 +6,7 @@ "dependencies": { "@aws-sdk/client-s3": "^3.812.0", "@aws-sdk/s3-request-presigner": "^3.812.0", - "@elizaos/core": "^1.0.0-beta.58", + "@elizaos/core-plugin-v2": "^1.0.0-beta.58", "@types/uuid": "10.0.0", "capsolver-npm": "2.1.9", "esbuild-plugin-copy": "^2.1.1", @@ -116,6 +116,8 @@ "@elizaos/core": ["@elizaos/core@1.0.0-beta.75", "", { "dependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/exporter-trace-otlp-http": "^0.201.1", "@opentelemetry/instrumentation": "^0.201.0", "@opentelemetry/instrumentation-pg": "^0.53.0", "@opentelemetry/resources": "^2.0.1", "@opentelemetry/sdk-metrics": "^2.0.0", "@opentelemetry/sdk-node": "^0.201.1", "@opentelemetry/sdk-trace-node": "^2.0.1", "@opentelemetry/semantic-conventions": "^1.34.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.1", "dotenv": "16.4.5", "events": "^3.3.0", "glob": "11.0.0", "handlebars": "^4.7.8", "js-sha1": "0.7.0", "langchain": "^0.3.15", "pdfjs-dist": "^5.2.133", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "stream-browserify": "^3.0.0", "unique-names-generator": "4.7.1", "uuid": "11.0.3", "vitest": "^3.1.3", "zod": "^3.24.4" } }, "sha512-Enzy089JHxItSuuysm/rW9vIPLb/F7Lw41y+MIFYmuBGMuRIgKa/P0+TqsyWyp9ENMLUjNMx80dvbWH0+6j3Wg=="], + "@elizaos/core-plugin-v2": ["@elizaos/core-plugin-v2@1.0.0-beta.58", "", { "dependencies": { "@elizaos/core": "^1.0.0-beta", "buffer": "^6.0.3", "crypto-browserify": "^3.12.1", "dotenv": "16.4.5", "events": "^3.3.0", "glob": "11.0.0", "handlebars": "^4.7.8", "js-sha1": "0.7.0", "langchain": "^0.3.15", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "stream-browserify": "^3.0.0", "unique-names-generator": "4.7.1", "uuid": "11.0.3" } }, "sha512-FWN4Dm7YYMdmYohFH4+2HVJNSd1IvyYvIQl8THg5UvslgbCP9xa/NqvjmXyk+uYzK7eh9pKCFleP8BQESrZ6QA=="], + "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.4", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q=="], "@esbuild/android-arm": ["@esbuild/android-arm@0.25.4", "", { "os": "android", "cpu": "arm" }, "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ=="], @@ -1248,6 +1250,10 @@ "@elizaos/core/uuid": ["uuid@11.0.3", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg=="], + "@elizaos/core-plugin-v2/glob": ["glob@11.0.0", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^4.0.1", "minimatch": "^10.0.0", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g=="], + + "@elizaos/core-plugin-v2/uuid": ["uuid@11.0.3", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg=="], + "@langchain/core/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="], "@langchain/core/uuid": ["uuid@10.0.0", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ=="], diff --git a/package.json b/package.json index e35b9e9..feceb65 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "@aws-sdk/client-s3": "^3.812.0", "@aws-sdk/s3-request-presigner": "^3.812.0", - "@elizaos/core": "^1.0.0-beta", + "@elizaos/core-plugin-v2": "^1.0.0-beta.58", "@types/uuid": "10.0.0", "capsolver-npm": "2.1.9", "esbuild-plugin-copy": "^2.1.1", diff --git a/src/index.ts b/src/index.ts index c68f68f..e6c4e27 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import type { Plugin } from "@elizaos/core"; +import type { Plugin } from "@elizaos/core-plugin-v2"; import { PdfService } from "./services/pdf"; diff --git a/src/services/pdf.ts b/src/services/pdf.ts index 947b081..8b35d0f 100644 --- a/src/services/pdf.ts +++ b/src/services/pdf.ts @@ -1,4 +1,4 @@ -import { type IAgentRuntime, Service, type ServiceTypeName, ServiceType } from '@elizaos/core'; +import { type IAgentRuntime, Service, type ServiceTypeName, ServiceType } from '@elizaos/core-plugin-v2'; import pkg from 'pdfjs-dist'; const { getDocument } = pkg; import type { TextItem, TextMarkedContent } from 'pdfjs-dist/types/src/display/api'; diff --git a/tsconfig.json b/tsconfig.json index 3c3c58b..9f472b0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,11 +14,7 @@ "emitDeclarationOnly": true, "resolveJsonModule": true, "moduleDetection": "force", - "allowArbitraryExtensions": true, - "paths": { - "@elizaos/core": ["../core/src"], - "@elizaos/core/*": ["../core/src/*"] - } + "allowArbitraryExtensions": true }, "include": ["src/**/*.ts"] } diff --git a/tsup.config.ts b/tsup.config.ts index 5393f71..8ede086 100644 --- a/tsup.config.ts +++ b/tsup.config.ts @@ -1,6 +1,4 @@ -import path from 'path'; import { defineConfig } from 'tsup'; -import { copy } from 'esbuild-plugin-copy'; export default defineConfig({ entry: ['src/index.ts'], @@ -9,7 +7,7 @@ export default defineConfig({ sourcemap: true, clean: true, format: ['esm'], // Ensure you're targeting CommonJS - dts: true, + dts: false, // Skip DTS generation to avoid external import issues // Ensure you're targeting CommonJS external: [ 'dotenv', // Externalize dotenv to prevent bundling 'fs', // Externalize fs to use Node.js built-in module @@ -20,17 +18,4 @@ export default defineConfig({ 'agentkeepalive', 'zod', ], - esbuildOptions(options) { - options.alias = { - '@/src': './src', - }; - }, - esbuildPlugins: [ - copy({ - assets: { - from: [path.resolve(__dirname, '../../node_modules/pdfjs-dist/legacy/build/pdf.worker.js')], - to: [path.resolve(__dirname, 'dist')], - }, - }), - ], });