Skip to content

Commit

Permalink
move apps, update publish
Browse files Browse the repository at this point in the history
dskvr committed Jan 11, 2024
1 parent 58824a2 commit 824690d
Showing 45 changed files with 23 additions and 55 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
@@ -12,8 +12,19 @@ jobs:
strategy:
matrix:
include:
- package: 'logger'
nodeVersion: '20'
- package: 'nocap'
nodeVersion: '18'
nodeVersion: '20'
- package: 'seed'
nodeVersion: '20'
- package: 'utils'
nodeVersion: '20'
- package: 'nwcache'
nodeVersion: '20'
- package: 'controlflow'
nodeVersion: '20'

steps:
- uses: actions/checkout@v3

@@ -24,7 +35,7 @@ jobs:

- name: Change to package directory
run: cd packages/${{ matrix.package }}

- run: yarn install
- run: yarn test

@@ -45,4 +56,4 @@ jobs:
release_name: v${{ matrix.package }}-${{ steps.publish.outputs.version }}
body: ""
draft: false
prerelease: true
prerelease: true
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@ ours.sh
.pg
packages/synx
packages/kinds
.npmrc
.npmrc
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ export class AllManager extends WorkerManager {
constructor($, rcache, opts){
super($, rcache, opts)
this.interval = 60*1000 //checks for expired items every...
this.timeout = 6*1000
this.timeout = 9*1000
this.timeoutBuffer = 1000
}

@@ -74,8 +74,9 @@ export class AllManager extends WorkerManager {
async on_failed(job, err){
const { relay:url } = job.data
this.log?.debug(`Websocket check failed for ${job.data.relay}: ${JSON.stringify(err)}`)
const retry_id = await this.retry.setRetries(url, false)
const retry_id = await this.retry.setRetries( url, false )
const lastChecked_id = await this.setLastChecked( url, Date.now() )
const relay_id = await this.updateRelayCache({ url, connect: { data: false }} )
this.progressMessage(url, null, true)
this.processed++
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions packages/history-relay/.gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions packages/history-relay/docker-compose.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions packages/history-relay/whitelist.js

This file was deleted.

4 changes: 2 additions & 2 deletions packages/publisher/src/kinds/Kind10066.js
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ export class Kind10066 extends Publisher {
this.kind = 10066
}

generateEvent(publisher){
generateEvent(relay){
const eventTpl = this.tpl()
const tags = []

const { url, kinds, parameters, geo, } = publisher
// const { url, kinds, parameters, geo, } = publisher

if(kinds)
kinds.forEach( kind => tags.push(['kind', kind]) )
6 changes: 3 additions & 3 deletions packages/publisher/src/kinds/Kind30066.js
Original file line number Diff line number Diff line change
@@ -24,9 +24,6 @@ export class Kind30066 extends Publisher {
if(relay?.ssltag)
tags.push(relay.ssltag)

if(relay?.geo)
relay?.geo.forEach( geo => tags.push(geo) )

if(relay?.labels){
relay.labels.forEach(labels => {
const key = labels.shift()
@@ -35,6 +32,9 @@ export class Kind30066 extends Publisher {
})
}

if(relay?.geo)
relay?.geo.forEach( geo => tags.push(geo) )

if(relay?.nips && relay?.nips instanceof Array)
relay.nips.forEach( nip => tags.push(['N', `${nip}`]) )

0 comments on commit 824690d

Please sign in to comment.