Compare commits

..

No commits in common. "master" and "sigit-issue-30" have entirely different histories.

8 changed files with 34 additions and 76 deletions

View File

@ -6,11 +6,11 @@ Building on the great work of Pablo: https://github.com/pablof7z/nostr-data-vend
The following Jobs are supported by this DVM: The following Jobs are supported by this DVM:
- Get OnNostrSince Block Height - Get OnNostrSince Block Height
- Send nPub get Block Height (from blockchain.info) - Send nPub get Block Height (from blockchain.info)
- More job types will be added in the future - More job types will be added in the future
# Demo video # Demo video
@ -39,7 +39,7 @@ pnpm run build
``` ```
```sh ```sh
pm2 start --name "Sigit-DVM" npm -- start pm2 start --name "Sigit-DVM" -- start
``` ```
## Make PM2 auto start on reboot ## Make PM2 auto start on reboot

View File

@ -18,8 +18,7 @@ export async function blockChainBlockNumberJob(
return closestObject.block_index.toString() return closestObject.block_index.toString()
}) })
.catch((err) => { .catch((err) => {
log('err in blockChain request :>> ', err) console.log('err in blockChain request :>> ', err)
return Promise.reject(err) return Promise.reject(err)
}) })

View File

@ -1,8 +1,9 @@
import { NDKEvent, type NostrEvent } from '@nostr-dev-kit/ndk' import { NDKEvent, type NostrEvent } from '@nostr-dev-kit/ndk'
import axios from 'axios' import axios from 'axios'
import FormData from 'form-data' import FormData from 'form-data'
import { log } from '../main.js'
import { fetchFileFromInput } from '../utils/fetch-file-from-input.js' import { fetchFileFromInput } from '../utils/fetch-file-from-input.js'
import { ndk, log } from '../main.js' import { ndk } from '../main.js'
// import { fileTypeFromFile, type FileTypeResult } from 'file-type'; // import { fileTypeFromFile, type FileTypeResult } from 'file-type';
import { exec } from 'child_process' import { exec } from 'child_process'
import fs from 'fs' import fs from 'fs'
@ -42,8 +43,7 @@ export async function speechToTextJob(event: NDKEvent): Promise<string> {
} }
const formData = new FormData() const formData = new FormData()
const a = fs.createReadStream(file) const a = fs.createReadStream(file)
console.log({ a })
log({ a })
formData.append('file', a) formData.append('file', a)
formData.append('model', 'whisper-1') formData.append('model', 'whisper-1')
@ -57,14 +57,12 @@ export async function speechToTextJob(event: NDKEvent): Promise<string> {
}) })
.then((response) => { .then((response) => {
const { text } = response.data const { text } = response.data
console.log({ text })
log({ text })
resolve(text) resolve(text)
// Handle response // Handle response
}) })
.catch((error) => { .catch((error) => {
log({ error }) console.log({ error })
// Handle error // Handle error
}) })
}, 1000) }, 1000)
@ -80,11 +78,9 @@ export async function speechToTextJob(event: NDKEvent): Promise<string> {
const endTime = range[3] const endTime = range[3]
const randomName = Math.random().toString(36).substring(7) + '.mp3' const randomName = Math.random().toString(36).substring(7) + '.mp3'
const command = `ffmpeg -ss ${startTime} -to ${endTime} -i ${file} -vn -acodec copy ${randomName}` const command = `ffmpeg -ss ${startTime} -to ${endTime} -i ${file} -vn -acodec copy ${randomName}`
console.log({ startTime, endTime, randomName, command })
log({ startTime, endTime, randomName, command })
exec(command, (error, stderr, stdout) => { exec(command, (error, stderr, stdout) => {
log('ffmpeg', { error, stderr, stdout }) console.log('ffmpeg', { error, stderr, stdout })
whisperCommand(resolve, randomName) whisperCommand(resolve, randomName)
}) })

View File

@ -1,14 +1,11 @@
import { NDKEvent } from '@nostr-dev-kit/ndk' import { NDKEvent } from '@nostr-dev-kit/ndk'
import { validateJobRequest } from '../validations/index.js' import { validateJobRequest } from '../validations/index.js'
import { inProgress } from '../jobs/reactions/in-progress.js' import { inProgress } from '../jobs/reactions/in-progress.js'
import { log } from '../main.js'
export async function onNewSummarizationJob(event: NDKEvent): Promise<void> { export async function onNewSummarizationJob(event: NDKEvent): Promise<void> {
log('New summarization job') console.log('New summarization job')
await validateJobRequest(event).catch((err) => await validateJobRequest(event)
log(`Job validation error: `, err)
)
inProgress(event).catch((err) => log('Processing event error: ', err)) inProgress(event)
} }

View File

@ -1,5 +1,5 @@
import { NDKEvent } from '@nostr-dev-kit/ndk' import { NDKEvent } from '@nostr-dev-kit/ndk'
import { ndk, log } from '../../main.js' import { log, ndk } from '../../main.js'
export async function inProgress(event: NDKEvent): Promise<NDKEvent> { export async function inProgress(event: NDKEvent): Promise<NDKEvent> {
log('marking job as in progress') log('marking job as in progress')
@ -11,13 +11,7 @@ export async function inProgress(event: NDKEvent): Promise<NDKEvent> {
}) })
reactEvent.tag(event, 'job') reactEvent.tag(event, 'job')
await reactEvent.sign()
await reactEvent.sign().catch((err) => { await reactEvent.publish()
throw `Event signing error: ${err}`
})
await reactEvent.publish().catch((err) => {
throw `Event publishing error: ${err}`
})
return reactEvent return reactEvent
} }

View File

@ -14,7 +14,7 @@ export async function publishStatus(
tags: [['status', status], ...extraTags] tags: [['status', status], ...extraTags]
}) })
log({ extraTags }) console.log({ extraTags })
reactEvent.tag(event, 'job') reactEvent.tag(event, 'job')
await reactEvent.sign() await reactEvent.sign()

View File

@ -28,9 +28,7 @@ export const ndk = new NDK({
], ],
signer: getSigner() signer: getSigner()
}) })
await ndk.connect(2000)
await ndk.connect(2000).catch((err) => log('NDK connection error: ', err))
log('connected') log('connected')
const subs = ndk.subscribe( const subs = ndk.subscribe(
@ -198,44 +196,25 @@ async function processJobEvent(event: NDKEvent, type: JobType): Promise<void> {
return promise return promise
} }
const logJobError = (job: JobType, err: any) =>
log(`Error thrown by ${job}: `, err)
const startProcessing = async () => { const startProcessing = async () => {
log('startProcessing') log('startProcessing')
await inProgress(event)
await inProgress(event).catch((err) => log('Processing event error: ', err))
switch (type) { switch (type) {
case JobTypes.Summarize: { case JobTypes.Summarize: {
output = await onNewSummarizationJob(event).catch((err) => output = await onNewSummarizationJob(event)
logJobError(JobTypes.Summarize, err)
)
break break
} }
case JobTypes.SpeechToText: { case JobTypes.SpeechToText: {
output = await speechToTextJob(event).catch((err) => output = await speechToTextJob(event)
logJobError(JobTypes.SpeechToText, err)
)
break break
} }
case JobTypes.BlockChainBlockNumber: { case JobTypes.BlockChainBlockNumber: {
output = await blockChainBlockNumberJob(event).catch((err) => output = await blockChainBlockNumberJob(event)
logJobError(JobTypes.BlockChainBlockNumber, err)
)
break break
} }
case JobTypes.RelayInfo: { case JobTypes.RelayInfo: {
output = await relayInfoJob(event).catch((err) => output = await relayInfoJob(event)
logJobError(JobTypes.RelayInfo, err)
)
break break
} }
} }
@ -246,9 +225,7 @@ async function processJobEvent(event: NDKEvent, type: JobType): Promise<void> {
complete(event, missingAmount(), { output }) complete(event, missingAmount(), { output })
} }
await validateJobRequest(event).catch((err) => await validateJobRequest(event)
log(`Job validation error: `, err)
)
if (jobAmount > paidAmount && waitForPaymentBeforeProcessing()) { if (jobAmount > paidAmount && waitForPaymentBeforeProcessing()) {
await reqPayment() await reqPayment()
@ -257,7 +234,9 @@ async function processJobEvent(event: NDKEvent, type: JobType): Promise<void> {
await startProcessing() await startProcessing()
await publishStatus(event, 'finished').catch((err) => log('err :>> ', err)) await publishStatus(event, 'finished').catch((err) =>
console.log('err :>> ', err)
)
if (jobAmount > paidAmount && waitForPaymentBeforePublishingResult()) { if (jobAmount > paidAmount && waitForPaymentBeforePublishingResult()) {
await reqPayment() await reqPayment()

View File

@ -2,19 +2,13 @@ import { NDKEvent, type NostrEvent } from '@nostr-dev-kit/ndk'
import validateExpiration from './expiration.js' import validateExpiration from './expiration.js'
import validateRequester from './requester.js' import validateRequester from './requester.js'
import validateNoRecentResults from './no-recent-results.js' import validateNoRecentResults from './no-recent-results.js'
import { ndk, log } from '../main.js' import { ndk } from '../main.js'
import { addAmount } from '../job-types/speech-to-text.js' import { addAmount } from '../job-types/speech-to-text.js'
export async function validateJobRequest(event: NDKEvent): Promise<void> { export async function validateJobRequest(event: NDKEvent): Promise<void> {
await validateExpiration(event).catch((err) => { await validateExpiration(event)
throw `Expiration error: ${err}` await validateRequester(event)
}) await validateNoRecentResults(event)
await validateRequester(event).catch((err) => {
throw `Requester error: ${err}`
})
await validateNoRecentResults(event).catch((err) => {
throw `No recent results error: ${err}`
})
} }
export async function requirePayment( export async function requirePayment(
@ -40,8 +34,7 @@ export async function requirePayment(
payReq.tag(event, 'job') payReq.tag(event, 'job')
await payReq.sign() await payReq.sign()
console.log(payReq.rawEvent())
log(payReq.rawEvent())
if (publish !== false) await payReq.publish() if (publish !== false) await payReq.publish()