Skip to content

fix: parsing response twice errors node-fetch #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avenze wants to merge 15 commits into
base: master
Choose a base branch
from
Open

fix: parsing response twice errors node-fetch #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
95bff5b
chore: bump manifest version to nightly 3.14.4-beta.1
github-actions[bot] Apr 28, 2024
e670472
chore: bump manifest version to 3.15.0
github-actions[bot] Apr 28, 2024
65e1f8c
fix(apps/phone): disabling apps
itschip May 1, 2024
d4ee9fe
chore: bump manifest version to nightly 3.15.1-beta.0
github-actions[bot] May 1, 2024
481b204
feat: complete french locale (#1152)
TonybynMp4 May 23, 2024
43fea82
chore: bump manifest version to nightly 3.15.1-beta.1
github-actions[bot] May 23, 2024
6a37cc7
chore: format stuff
itschip Sep 3, 2024
0589a85
chore: bump manifest version to nightly 3.15.1-beta.2
github-actions[bot] Sep 3, 2024
4b2bbf1
Update ba.json
2blqck Oct 29, 2024
7038b43
Update form-data obj name
Nov 14, 2024
bbb5327
Merge pull request #1185 from Sharkiiie/master
itschip Nov 14, 2024
2337a4b
chore: remove api app
itschip Dec 19, 2024
b85cee7
Merge pull request #1183 from 2blqck/master
itschip Dec 19, 2024
8a9fa74
feat: dont look
itschip Dec 19, 2024
37c00a1
fix: parsing response twice errors node-fetch
Avenze Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions apps/api/package.json
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions apps/api/src/contacts/contact-service.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/api/src/database/data-source.ts
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions apps/api/src/index.ts
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions apps/api/tsconfig.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/game/server/audio/audio.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class _AudioService {
try {
const form_data = new FormData();
const blob = fileFromSync(filePath, 'audio/ogg');
form_data.append('recording', blob);
form_data.append('file', blob);

const res = await fetch(config.voiceMessage.url, {
method: 'POST',
Expand Down
142 changes: 71 additions & 71 deletions apps/game/server/bridge/ndcore/ndcore-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
import { config } from '@npwd/config/server';
import PlayerService from '../../players/player.service';
import { mainLogger } from '../../sv_logger';
import { Strategy } from '../framework-strategy';
import { config } from "@npwd/config/server";
import PlayerService from "../../players/player.service";
import { mainLogger } from "../../sv_logger";
import { Strategy } from "../framework-strategy";

type NDPlayer = {
id: number;
source: number;
identifier: string;
nickname: string;
user: string;
roles: unknown;
name: string;
firstname: string;
lastname: string;
fullname: string;
dob: string;
gender: string;
phonenumber: string;
cash: number;
bank: number;
groups: unknown;
job: string;
jobInfo: unknown;
label: string;
rankName: string;
rank: number;
metadata: unknown;
inventory: unknown;
id: number;
source: number;
identifier: string;
nickname: string;
user: string;
roles: unknown;
name: string;
firstname: string;
lastname: string;
fullname: string;
dob: string;
gender: string;
phonenumber: string;
cash: number;
bank: number;
groups: unknown;
job: string;
jobInfo: unknown;
label: string;
rankName: string;
rank: number;
metadata: unknown;
inventory: unknown;
};

// and this phone was supposed to be a 100% standalone my ass
export class NDCoreFramework implements Strategy {
constructor() {
mainLogger.info('Loading NDCore bridge....');
constructor() {
mainLogger.info("Loading NDCore bridge....");

config.general.useResourceIntegration = true;
config.database.identifierColumn = 'charid';
config.database.phoneNumberColumn = 'phonenumber';
config.database.playerTable = 'nd_characters';
config.database.identifierType = 'license';
}
config.general.useResourceIntegration = true;
config.database.identifierColumn = "charid";
config.database.phoneNumberColumn = "phonenumber";
config.database.playerTable = "nd_characters";
config.database.identifierType = "license";
}

init(): void {
on('ND:characterLoaded', async (player: NDPlayer) => {
const playerIdent = player.id;
const phoneNumber = player?.phonenumber;
const playerSrc = player.source;
init(): void {
on("ND:characterLoaded", async (player: NDPlayer) => {
const playerIdent = player.id;
const phoneNumber = player?.phonenumber;
const playerSrc = player.source;

await PlayerService.handleNewPlayerEvent({
identifier: playerIdent.toString(),
source: playerSrc,
phoneNumber: phoneNumber ?? null,
firstname: player.firstname,
lastname: player.lastname,
});
});
await PlayerService.handleNewPlayerEvent({
identifier: playerIdent.toString(),
source: playerSrc,
phoneNumber: phoneNumber ?? null,
firstname: player.firstname,
lastname: player.lastname,
});
});

on('ND:characterUnloaded', async (source: number) => {
await PlayerService.handleUnloadPlayerEvent(source);
});
on("ND:characterUnloaded", async (source: number) => {
await PlayerService.handleUnloadPlayerEvent(source);
});

mainLogger.info('NDCore bridge initialized');
}
mainLogger.info("NDCore bridge initialized");
}

onStart(): void {
on('onServerResourceStart', async (resource: string) => {
const NDCore = global.exports['ND_Core'];
onStart(): void {
on("onServerResourceStart", async (resource: string) => {
const NDCore = global.exports["ND_Core"];

if (resource === GetCurrentResourceName()) {
const onlinePlayers = NDCore.getPlayers() as NDPlayer[];
for (const player of onlinePlayers) {
const phoneNumber = player?.phonenumber;
if (resource === GetCurrentResourceName()) {
const onlinePlayers = NDCore.getPlayers() as NDPlayer[];
for (const player of onlinePlayers) {
const phoneNumber = player?.phonenumber;

await PlayerService.handleNewPlayerEvent({
source: player.source,
identifier: player.id.toString(),
phoneNumber: phoneNumber ?? null,
firstname: player.firstname,
lastname: player.lastname,
});
}
}
});
}
await PlayerService.handleNewPlayerEvent({
source: player.source,
identifier: player.id.toString(),
phoneNumber: phoneNumber ?? null,
firstname: player.firstname,
lastname: player.lastname,
});
}
}
});
}
}
10 changes: 5 additions & 5 deletions apps/game/server/lib/http-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ export async function apiPhotoUpload(body: string | FormData, token: string): Pr
if (result.status !== 200) {
const err = await result.text();
reject({ errorText: err, statusCode: result.status });
}

const res = await result.json();
resolve(res);
} else {
const res = await result.json();
resolve(res);
};
}),
);
}
Expand Down Expand Up @@ -74,4 +74,4 @@ export async function webhookPhotoUpload(
reject(err);
}),
);
}
}
Loading