Skip to content

Commit c8287d6

Browse files
sisygoboomsisygoboom
authoredJun 28, 2024··
Merge pull request #26 from spknetwork/tusd-fix
Tusd fix
2 parents 92a99b9 + 072d888 commit c8287d6

18 files changed

+59
-40
lines changed
 

‎Dockerfile.staging

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM node:18.14.2-alpine
22
WORKDIR /usr/app
33
COPY package*.json ./
4-
RUN apk add --no-cache git python3 make g++
4+
RUN apk add --no-cache git python3 make g++ ffmpeg
55
RUN npm install && npm install typescript -g
66
COPY . .
77
RUN tsc

‎caddy/Caddyfile

-3
This file was deleted.

‎caddy/Caddyfile.staging

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
staging.3speak.tv {
2+
handle_path /api/* {
3+
reverse_proxy acela-core:4569
4+
}
5+
6+
reverse_proxy /tusd/* tusd:1080
7+
}

‎docker-compose.local.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
- mongo
2424
tusd:
2525
image: tusproject/tusd:v1.9
26-
command: -s3-bucket mybucket -s3-endpoint http://minio:9000 -host=0.0.0.0 -port=1080 -behind-proxy -max-size 5000000000 -hooks-http http://acela-core:4569/api/v1/tus-callback
26+
command: -host=0.0.0.0 -port=1080 -base-path /tusd/files/ -behind-proxy -max-size 5000000000 -hooks-http http://acela-core:4569/v1/upload/tus-callback
2727
volumes:
2828
- ./data/tusd-uploads:/data
2929
networks:

‎docker-compose.staging.yml

+15-7
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@ services:
66
- "80:80"
77
- "443:443"
88
volumes:
9-
- ./caddy/Caddyfile:/etc/caddy/Caddyfile
9+
- ./caddy/Caddyfile.staging:/etc/caddy/Caddyfile
1010
- /data/caddy/data:/data
1111
- /data/caddy/config:/config
1212
networks:
1313
- web
1414
- acela-core
15-
acela-core: # name of the service
15+
environment:
16+
- ACME_AGREE=true
17+
depends_on:
18+
- acela-core
19+
- tusd
20+
21+
acela-core:
1622
build:
17-
context: . # the directory containing Docker context (".", meaning the current directory)
18-
dockerfile: Dockerfile.staging # specify the local Dockerfile
19-
container_name: acela-core # what to label the container for docker ps
20-
restart: always # restart if failed, until we stop it ourselves
23+
context: .
24+
dockerfile: Dockerfile.staging
25+
container_name: acela-core
26+
restart: always
2127
env_file:
2228
- .env.staging
2329
#external_links:
@@ -32,9 +38,10 @@ services:
3238
UPLOAD_PATH: /acela-uploads
3339
volumes:
3440
- ./data/acela-uploads:/acela-uploads
41+
3542
tusd:
3643
image: tusproject/tusd:v1.9
37-
command: -s3-bucket mybucket -s3-endpoint http://minio:9000 -host=0.0.0.0 -port=1080 -behind-proxy -max-size 5000000000 -hooks-http http://acela-core:4569/api/v1/tus-callback
44+
command: -host=0.0.0.0 -port=1080 -base-path /tusd/files/ -behind-proxy -max-size 5000000000 -hooks-http http://acela-core:4569/v1/upload/tus-callback
3845
volumes:
3946
- ./data/tusd-uploads:/data
4047
networks:
@@ -45,6 +52,7 @@ services:
4552
AWS_ACCESS_KEY_ID: AKIAIOSFODNN7EXAMPLE
4653
AWS_SECRET_ACCESS_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
4754
AWS_REGION: eu-west-1
55+
4856
minio:
4957
image: minio/minio:RELEASE.2019-08-14T20-37-41Z
5058
networks:

‎runTusd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
tusd -upload-dir=./data/ -base-path="/files" -host="127.0.0.1" -port="1080" -behind-proxy --hooks-enabled-events pre-create,post-create,post-finish,post-finish,post-terminate,post-receive -max-size 5000000000 -hooks-http http://localhost:4569/api/v1/upload/tus-callback
2+
tusd -upload-dir=./data/ -base-path="/files" -host="127.0.0.1" -port="1080" -behind-proxy --hooks-enabled-events pre-create,post-create,post-finish,post-finish,post-terminate,post-receive -max-size 5000000000 -hooks-http http://localhost:4569/v1/upload/tus-callback

‎src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async function startup(): Promise<void> {
1515
app.useGlobalPipes(new ValidationPipe());
1616
const config = new DocumentBuilder().build();
1717
const document = SwaggerModule.createDocument(app, config);
18-
SwaggerModule.setup('/api/v1/docs', app, document);
18+
SwaggerModule.setup('/v1/docs', app, document);
1919
await app.listen(4569);
2020
}
2121

‎src/services/api/api.contoller.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ describe('ApiController', () => {
109109
await mongod.stop();
110110
});
111111

112-
describe('/POST /api/v1/hive/post_comment', () => {
112+
describe('/POST /v1/hive/post_comment', () => {
113113
it('should post a comment to HIVE blockchain', async () => {
114114
const jwtToken = 'test_jwt_token';
115115
const body = {
@@ -120,7 +120,7 @@ describe('ApiController', () => {
120120
};
121121

122122
return request(app.getHttpServer())
123-
.post('/api/v1/hive/post_comment')
123+
.post('/v1/hive/post_comment')
124124
.set('Authorization', `Bearer ${jwtToken}`)
125125
.send(body)
126126
.expect(201)
@@ -135,13 +135,13 @@ describe('ApiController', () => {
135135
});
136136
});
137137

138-
describe('/POST /api/v1/hive/linkaccount', () => {
138+
describe('/POST /v1/hive/linkaccount', () => {
139139
it('should link a Hive account', async () => {
140140
const jwtToken = 'test_jwt_token';
141141
const body = { username: 'test-account' };
142142

143143
return request(app.getHttpServer())
144-
.post('/api/v1/hive/linkaccount')
144+
.post('/v1/hive/linkaccount')
145145
.set('Authorization', `Bearer ${jwtToken}`)
146146
.send(body)
147147
.expect(201)
@@ -153,12 +153,12 @@ describe('ApiController', () => {
153153
});
154154
});
155155

156-
describe('/GET /api/v1/profile', () => {
156+
describe('/GET /v1/profile', () => {
157157
it('should get the user profile', async () => {
158158
const jwtToken = 'test_jwt_token';
159159

160160
return request(app.getHttpServer())
161-
.get('/api/v1/profile')
161+
.get('/v1/profile')
162162
.set('Authorization', `Bearer ${jwtToken}`)
163163
.expect(200)
164164
.then(response => {
@@ -172,7 +172,7 @@ describe('ApiController', () => {
172172
});
173173
});
174174

175-
describe('/GET /api/v1/hive/linked-account/list', () => {
175+
describe('/GET /v1/hive/linked-account/list', () => {
176176
it('should list linked accounts', async () => {
177177
const jwtToken = 'test_jwt_token';
178178

@@ -181,7 +181,7 @@ describe('ApiController', () => {
181181
await linkedAccountsRepository.verify(link._id);
182182

183183
return request(app.getHttpServer())
184-
.get('/api/v1/hive/linked-account/list')
184+
.get('/v1/hive/linked-account/list')
185185
.set('Authorization', `Bearer ${jwtToken}`)
186186
.expect(200)
187187
.then(response => {

‎src/services/api/api.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { LinkedAccountRepository } from '../../repositories/linked-accounts/link
3232
import { EmailService } from '../email/email.service';
3333
import { parseAndValidateRequest } from '../auth/auth.utils';
3434

35-
@Controller('/api/v1')
35+
@Controller('/v1')
3636
export class ApiController {
3737
readonly #logger = new Logger();
3838

‎src/services/auth/auth.controller.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ describe('AuthController', () => {
124124
const jws = await did.createJWS(payload);
125125

126126
return request(app.getHttpServer())
127-
.post('/api/v1/auth/login/singleton/did')
127+
.post('/v1/auth/login/singleton/did')
128128
.send(jws)
129129
.set('Content-Type', 'application/json')
130130
.set('Accept', 'application/json')
@@ -143,7 +143,7 @@ describe('AuthController', () => {
143143

144144
// Make the request to the endpoint
145145
return request(app.getHttpServer())
146-
.post('/api/v1/auth/request_hive_account')
146+
.post('/v1/auth/request_hive_account')
147147
.send({ username: 'test_user_id' })
148148
.set('Authorization', 'Bearer <your_mocked_jwt_token>')
149149
.expect(201)
@@ -163,7 +163,7 @@ describe('AuthController', () => {
163163

164164
// Make the request to the endpoint
165165
return request(app.getHttpServer())
166-
.post('/api/v1/auth/request_hive_account')
166+
.post('/v1/auth/request_hive_account')
167167
.send({ username: 'yeet' })
168168
.set('Authorization', 'Bearer <your_mocked_jwt_token>')
169169
.expect(400)
@@ -191,7 +191,7 @@ describe('AuthController', () => {
191191
}
192192

193193
return request(app.getHttpServer())
194-
.post('/api/v1/auth/login/singleton/hive')
194+
.post('/v1/auth/login/singleton/hive')
195195
.send(body)
196196
.expect(201)
197197
.then(response => {
@@ -214,7 +214,7 @@ describe('AuthController', () => {
214214
}
215215

216216
return request(app.getHttpServer())
217-
.post('/api/v1/auth/login/singleton/hive')
217+
.post('/v1/auth/login/singleton/hive')
218218
.send(body)
219219
.expect(401)
220220
.then(response => {
@@ -239,7 +239,7 @@ describe('AuthController', () => {
239239
}
240240

241241
return request(app.getHttpServer())
242-
.post('/api/v1/auth/login/singleton/hive')
242+
.post('/v1/auth/login/singleton/hive')
243243
.send(body)
244244
.expect(401)
245245
.then(response => {
@@ -264,7 +264,7 @@ describe('AuthController', () => {
264264
}
265265

266266
return request(app.getHttpServer())
267-
.post('/api/v1/auth/login/singleton/hive')
267+
.post('/v1/auth/login/singleton/hive')
268268
.send(body)
269269
.expect(401)
270270
.then(response => {
@@ -287,7 +287,7 @@ describe('AuthController', () => {
287287
}
288288

289289
return request(app.getHttpServer())
290-
.post('/api/v1/auth/login/singleton/hive')
290+
.post('/v1/auth/login/singleton/hive')
291291
.send(body)
292292
.expect(401)
293293
.then(response => {

‎src/services/auth/auth.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import { parseAndValidateRequest } from './auth.utils';
4444
import { RequestHiveAccountDto } from '../api/dto/RequestHiveAccount.dto';
4545
import { HiveService } from '../hive/hive.service';
4646

47-
@Controller('/api/v1/auth')
47+
@Controller('/v1/auth')
4848
export class AuthController {
4949
readonly #logger = new Logger(AuthController.name);
5050

‎src/services/auth/auth.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ import { HiveAccountModule } from '../../repositories/hive-account/hive-account.
4646
})
4747
export class AuthModule implements NestModule {
4848
configure(consumer: MiddlewareConsumer) {
49-
consumer.apply(AuthMiddleware).forRoutes('/api/v1/auth/login_singleton/did');
49+
consumer.apply(AuthMiddleware).forRoutes('/v1/auth/login_singleton/did');
5050
}
5151
}

‎src/services/email/email.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class EmailService {
3535
await this.send(
3636
email,
3737
'Complete 3Speak registration',
38-
`test registration. Click <a href="http://${this.configService.get('PUBLIC_CALLBACK_URL') || 'localhost:4569'}/api/v1/auth/verifyemail?code=${email_code}">here</a> to verify email address.`,
38+
`test registration. Click <a href="http://${this.configService.get('PUBLIC_CALLBACK_URL') || 'localhost:4569'}/v1/auth/verifyemail?code=${email_code}">here</a> to verify email address.`,
3939
);
4040
}
4141
}

‎src/services/storage-cluster/allocator.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ export class StorageClusterAllocator extends StorageCluster {
293293
allocations: {
294294
id: peerId,
295295
allocated_at: ts,
296+
reported_size: 0,
296297
},
297298
},
298299
$inc: {
@@ -410,6 +411,10 @@ export class StorageClusterAllocator extends StorageCluster {
410411
const reported_sizes = pinned.allocations
411412
.map((a) => a.reported_size)
412413
.filter((size) => size !== null && typeof size !== 'undefined');
414+
if (!completedPin.size) {
415+
console.error('No size found for pin ' + completedPin.cid);
416+
completedPin.size = 0;
417+
}
413418
reported_sizes.push(completedPin.size);
414419
if (preAllocated === -1) {
415420
await this.pins.updateOne(
@@ -420,7 +425,7 @@ export class StorageClusterAllocator extends StorageCluster {
420425
id: peerId,
421426
allocated_at: msgTs,
422427
pinned_at: msgTs,
423-
reported_size: completedPin.size || 0,
428+
reported_size: completedPin.size,
424429
},
425430
},
426431
$inc: {
@@ -510,7 +515,7 @@ export class StorageClusterAllocator extends StorageCluster {
510515
id: peerId,
511516
allocated_at: msgTs,
512517
pinned_at: msgTs,
513-
reported_size: newPin.size,
518+
reported_size: newPin.size || 0,
514519
};
515520
if (!alreadyExists || alreadyExists.status === 'deleted')
516521
await this.pins.updateOne(
@@ -524,7 +529,7 @@ export class StorageClusterAllocator extends StorageCluster {
524529
last_updated: msgTs,
525530
allocations: [newAlloc],
526531
allocationCount: 1,
527-
median_size: newPin.size || 0, // Ensure median_size is of type number
532+
median_size: newPin.size, // Ensure median_size is of type number
528533
metadata: newPin.metadata || {},
529534
},
530535
},

‎src/services/storage-cluster/peer.ts

+2
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ export class StorageClusterPeer extends StorageCluster {
232232
allocations: {
233233
id: this.getPeerId(),
234234
allocated_at: msgTs,
235+
reported_size: 0,
235236
},
236237
},
237238
$inc: {
@@ -348,6 +349,7 @@ export class StorageClusterPeer extends StorageCluster {
348349
type: SocketMsgTypes.PIN_FAILED,
349350
data: {
350351
cid: cid,
352+
size: 0,
351353
},
352354
ts: failedTs,
353355
});

‎src/services/storage-cluster/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export interface PinAllocate {
113113
id: string;
114114
allocated_at: number;
115115
pinned_at?: number | undefined;
116-
reported_size?: number | undefined;
116+
reported_size: number;
117117
}
118118

119119
export interface Pin {

‎src/services/uploader/uploading.controller.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ describe('UploadingController', () => {
105105
.toBuffer();
106106

107107
return request(app.getHttpServer())
108-
.post('/api/v1/upload/thumbnail')
108+
.post('/v1/upload/thumbnail')
109109
.set('Authorization', `Bearer ${jwtToken}`)
110110
.attach('file', semiTransparentRedPng, 'test-image.png')
111111
.field('video_id', 'test_video_id')

‎src/services/uploader/uploading.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ MulterModule.registerAsync({
3434
}),
3535
});
3636

37-
@Controller('/api/v1/upload')
37+
@Controller('/v1/upload')
3838
export class UploadingController {
3939
readonly #logger = new Logger(UploadingController.name);
4040

0 commit comments

Comments
 (0)
Please sign in to comment.