Compare commits
No commits in common. "master" and "sigit-issue-30" have entirely different histories.
master
...
sigit-issu
@ -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:
|
||||
|
||||
- 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
|
||||
|
||||
@ -39,7 +39,7 @@ pnpm run build
|
||||
```
|
||||
|
||||
```sh
|
||||
pm2 start --name "Sigit-DVM" npm -- start
|
||||
pm2 start --name "Sigit-DVM" -- start
|
||||
```
|
||||
|
||||
## Make PM2 auto start on reboot
|
||||
|
@ -18,8 +18,7 @@ export async function blockChainBlockNumberJob(
|
||||
return closestObject.block_index.toString()
|
||||
})
|
||||
.catch((err) => {
|
||||
log('err in blockChain request :>> ', err)
|
||||
|
||||
console.log('err in blockChain request :>> ', err)
|
||||
return Promise.reject(err)
|
||||
})
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
import { NDKEvent, type NostrEvent } from '@nostr-dev-kit/ndk'
|
||||
import axios from 'axios'
|
||||
import FormData from 'form-data'
|
||||
import { log } from '../main.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 { exec } from 'child_process'
|
||||
import fs from 'fs'
|
||||
@ -42,8 +43,7 @@ export async function speechToTextJob(event: NDKEvent): Promise<string> {
|
||||
}
|
||||
const formData = new FormData()
|
||||
const a = fs.createReadStream(file)
|
||||
|
||||
log({ a })
|
||||
console.log({ a })
|
||||
|
||||
formData.append('file', a)
|
||||
formData.append('model', 'whisper-1')
|
||||
@ -57,14 +57,12 @@ export async function speechToTextJob(event: NDKEvent): Promise<string> {
|
||||
})
|
||||
.then((response) => {
|
||||
const { text } = response.data
|
||||
|
||||
log({ text })
|
||||
|
||||
console.log({ text })
|
||||
resolve(text)
|
||||
// Handle response
|
||||
})
|
||||
.catch((error) => {
|
||||
log({ error })
|
||||
console.log({ error })
|
||||
// Handle error
|
||||
})
|
||||
}, 1000)
|
||||
@ -80,11 +78,9 @@ export async function speechToTextJob(event: NDKEvent): Promise<string> {
|
||||
const endTime = range[3]
|
||||
const randomName = Math.random().toString(36).substring(7) + '.mp3'
|
||||
const command = `ffmpeg -ss ${startTime} -to ${endTime} -i ${file} -vn -acodec copy ${randomName}`
|
||||
|
||||
log({ startTime, endTime, randomName, command })
|
||||
|
||||
console.log({ startTime, endTime, randomName, command })
|
||||
exec(command, (error, stderr, stdout) => {
|
||||
log('ffmpeg', { error, stderr, stdout })
|
||||
console.log('ffmpeg', { error, stderr, stdout })
|
||||
|
||||
whisperCommand(resolve, randomName)
|
||||
})
|
||||
|
@ -1,14 +1,11 @@
|
||||
import { NDKEvent } from '@nostr-dev-kit/ndk'
|
||||
import { validateJobRequest } from '../validations/index.js'
|
||||
import { inProgress } from '../jobs/reactions/in-progress.js'
|
||||
import { log } from '../main.js'
|
||||
|
||||
export async function onNewSummarizationJob(event: NDKEvent): Promise<void> {
|
||||
log('New summarization job')
|
||||
console.log('New summarization job')
|
||||
|
||||
await validateJobRequest(event).catch((err) =>
|
||||
log(`Job validation error: `, err)
|
||||
)
|
||||
await validateJobRequest(event)
|
||||
|
||||
inProgress(event).catch((err) => log('Processing event error: ', err))
|
||||
inProgress(event)
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
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> {
|
||||
log('marking job as in progress')
|
||||
@ -11,13 +11,7 @@ export async function inProgress(event: NDKEvent): Promise<NDKEvent> {
|
||||
})
|
||||
|
||||
reactEvent.tag(event, 'job')
|
||||
|
||||
await reactEvent.sign().catch((err) => {
|
||||
throw `Event signing error: ${err}`
|
||||
})
|
||||
await reactEvent.publish().catch((err) => {
|
||||
throw `Event publishing error: ${err}`
|
||||
})
|
||||
|
||||
await reactEvent.sign()
|
||||
await reactEvent.publish()
|
||||
return reactEvent
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ export async function publishStatus(
|
||||
tags: [['status', status], ...extraTags]
|
||||
})
|
||||
|
||||
log({ extraTags })
|
||||
console.log({ extraTags })
|
||||
|
||||
reactEvent.tag(event, 'job')
|
||||
await reactEvent.sign()
|
||||
|
41
src/main.ts
41
src/main.ts
@ -28,9 +28,7 @@ export const ndk = new NDK({
|
||||
],
|
||||
signer: getSigner()
|
||||
})
|
||||
|
||||
await ndk.connect(2000).catch((err) => log('NDK connection error: ', err))
|
||||
|
||||
await ndk.connect(2000)
|
||||
log('connected')
|
||||
|
||||
const subs = ndk.subscribe(
|
||||
@ -198,44 +196,25 @@ async function processJobEvent(event: NDKEvent, type: JobType): Promise<void> {
|
||||
return promise
|
||||
}
|
||||
|
||||
const logJobError = (job: JobType, err: any) =>
|
||||
log(`Error thrown by ${job}: `, err)
|
||||
|
||||
const startProcessing = async () => {
|
||||
log('startProcessing')
|
||||
|
||||
await inProgress(event).catch((err) => log('Processing event error: ', err))
|
||||
await inProgress(event)
|
||||
|
||||
switch (type) {
|
||||
case JobTypes.Summarize: {
|
||||
output = await onNewSummarizationJob(event).catch((err) =>
|
||||
logJobError(JobTypes.Summarize, err)
|
||||
)
|
||||
|
||||
output = await onNewSummarizationJob(event)
|
||||
break
|
||||
}
|
||||
|
||||
case JobTypes.SpeechToText: {
|
||||
output = await speechToTextJob(event).catch((err) =>
|
||||
logJobError(JobTypes.SpeechToText, err)
|
||||
)
|
||||
|
||||
output = await speechToTextJob(event)
|
||||
break
|
||||
}
|
||||
|
||||
case JobTypes.BlockChainBlockNumber: {
|
||||
output = await blockChainBlockNumberJob(event).catch((err) =>
|
||||
logJobError(JobTypes.BlockChainBlockNumber, err)
|
||||
)
|
||||
|
||||
output = await blockChainBlockNumberJob(event)
|
||||
break
|
||||
}
|
||||
|
||||
case JobTypes.RelayInfo: {
|
||||
output = await relayInfoJob(event).catch((err) =>
|
||||
logJobError(JobTypes.RelayInfo, err)
|
||||
)
|
||||
|
||||
output = await relayInfoJob(event)
|
||||
break
|
||||
}
|
||||
}
|
||||
@ -246,9 +225,7 @@ async function processJobEvent(event: NDKEvent, type: JobType): Promise<void> {
|
||||
complete(event, missingAmount(), { output })
|
||||
}
|
||||
|
||||
await validateJobRequest(event).catch((err) =>
|
||||
log(`Job validation error: `, err)
|
||||
)
|
||||
await validateJobRequest(event)
|
||||
|
||||
if (jobAmount > paidAmount && waitForPaymentBeforeProcessing()) {
|
||||
await reqPayment()
|
||||
@ -257,7 +234,9 @@ async function processJobEvent(event: NDKEvent, type: JobType): Promise<void> {
|
||||
|
||||
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()) {
|
||||
await reqPayment()
|
||||
|
@ -2,19 +2,13 @@ import { NDKEvent, type NostrEvent } from '@nostr-dev-kit/ndk'
|
||||
import validateExpiration from './expiration.js'
|
||||
import validateRequester from './requester.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'
|
||||
|
||||
export async function validateJobRequest(event: NDKEvent): Promise<void> {
|
||||
await validateExpiration(event).catch((err) => {
|
||||
throw `Expiration error: ${err}`
|
||||
})
|
||||
await validateRequester(event).catch((err) => {
|
||||
throw `Requester error: ${err}`
|
||||
})
|
||||
await validateNoRecentResults(event).catch((err) => {
|
||||
throw `No recent results error: ${err}`
|
||||
})
|
||||
await validateExpiration(event)
|
||||
await validateRequester(event)
|
||||
await validateNoRecentResults(event)
|
||||
}
|
||||
|
||||
export async function requirePayment(
|
||||
@ -40,8 +34,7 @@ export async function requirePayment(
|
||||
payReq.tag(event, 'job')
|
||||
|
||||
await payReq.sign()
|
||||
|
||||
log(payReq.rawEvent())
|
||||
console.log(payReq.rawEvent())
|
||||
|
||||
if (publish !== false) await payReq.publish()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user