Update logging

This commit is contained in:
Darren Clarke 2025-01-22 17:50:38 +01:00
parent def602c05e
commit 810a333429
39 changed files with 85 additions and 139 deletions

View file

@ -72,7 +72,7 @@ export const migrate = async (arg: string) => {
results?.forEach((it) => {
if (it.status === "Success") {
console.log(
console.info(
`Migration "${it.migrationName} ${it.direction.toLowerCase()}" was executed successfully`,
);
} else if (it.status === "Error") {

View file

@ -26,7 +26,6 @@ export const SendMessageRoute = withDefaults({
description: "Send a message",
async handler(request: Hapi.Request, _h: Hapi.ResponseToolkit) {
const { id } = request.params;
console.log({ payload: request.payload });
const { phoneNumber, message } = request.payload as MessageRequest;
const whatsappService = getService(request);
await whatsappService.send(id, phoneNumber, message as string);

View file

@ -57,7 +57,7 @@ export default class WhatsappService extends Service {
try {
connection.end(null);
} catch (error) {
console.log(error);
console.error(error);
}
}
this.connections = {};
@ -92,27 +92,27 @@ export default class WhatsappService extends Service {
isNewLogin,
} = update;
if (qr) {
console.log("got qr code");
console.info("got qr code");
const botDirectory = this.getBotDirectory(botID);
const qrPath = `${botDirectory}/qr.txt`;
fs.writeFileSync(qrPath, qr, "utf8");
} else if (isNewLogin) {
console.log("got new login");
console.info("got new login");
const botDirectory = this.getBotDirectory(botID);
const verifiedFile = `${botDirectory}/verified`;
fs.writeFileSync(verifiedFile, "");
} else if (connectionState === "open") {
console.log("opened connection");
console.info("opened connection");
} else if (connectionState === "close") {
console.log("connection closed due to ", lastDisconnect?.error);
console.info("connection closed due to ", lastDisconnect?.error);
const disconnectStatusCode = (lastDisconnect?.error as any)?.output
?.statusCode;
if (disconnectStatusCode === DisconnectReason.restartRequired) {
console.log("reconnecting after got new login");
console.info("reconnecting after got new login");
await this.createConnection(botID, server, options);
authCompleteCallback?.();
} else if (disconnectStatusCode !== DisconnectReason.loggedOut) {
console.log("reconnecting");
console.info("reconnecting");
await this.sleep(pause);
pause *= 2;
this.createConnection(botID, server, options);
@ -121,12 +121,12 @@ export default class WhatsappService extends Service {
}
if (events["creds.update"]) {
console.log("creds update");
console.info("creds update");
await saveCreds();
}
if (events["messages.upsert"]) {
console.log("messages upsert");
console.info("messages upsert");
const upsert = events["messages.upsert"];
const { messages } = upsert;
if (messages) {
@ -143,13 +143,13 @@ export default class WhatsappService extends Service {
const baseDirectory = this.getBaseDirectory();
const botIDs = fs.readdirSync(baseDirectory);
console.log({ botIDs });
for await (const botID of botIDs) {
const directory = this.getBotDirectory(botID);
const verifiedFile = `${directory}/verified`;
if (fs.existsSync(verifiedFile)) {
const { version, isLatest } = await fetchLatestBaileysVersion();
console.log(`using WA v${version.join(".")}, isLatest: ${isLatest}`);
console.info(`using WA v${version.join(".")}, isLatest: ${isLatest}`);
await this.createConnection(botID, this.server, {
browser: WhatsappService.browserDescription,
@ -169,7 +169,10 @@ export default class WhatsappService extends Service {
message,
messageTimestamp,
} = webMessageInfo;
console.log(webMessageInfo);
console.info("Message type debug");
for (const key in message) {
console.info(key, !!message[key as keyof proto.IMessage]);
}
const isValidMessage =
message && remoteJid !== "status@broadcast" && !fromMe;
if (isValidMessage) {

View file

@ -6,7 +6,7 @@ const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const startWorker = async () => {
console.log("Starting worker...");
console.info("Starting worker...");
await run({
connectionString: process.env.DATABASE_URL,

View file

@ -62,9 +62,8 @@ export const createZammadTicket = async (
},
});
} catch (error: any) {
console.log(Object.keys(error));
if (error.isBoom) {
console.log(error.output);
console.error(error.output);
throw new Error("Failed to create zamamd ticket");
}
}

View file

@ -25,7 +25,7 @@ const defaultAudioConvertOpts = {
**/
export const convert = (
input: Buffer,
opts?: AudioConvertOpts
opts?: AudioConvertOpts,
): Promise<Buffer> => {
const settings = { ...defaultAudioConvertOpts, ...opts };
return new Promise((resolve, reject) => {
@ -35,12 +35,8 @@ export const convert = (
.audioCodec(settings.audioCodec)
.audioBitrate(settings.bitrate)
.toFormat(settings.format)
.on("error", (err, stdout, stderr) => {
.on("error", (err, _stdout, _stderr) => {
console.error(err.message);
console.log("FFMPEG OUTPUT");
console.log(stdout);
console.log("FFMPEG ERROR");
console.log(stderr);
reject(err);
})
.on("end", () => {
@ -66,8 +62,12 @@ export const selfCheck = (): Promise<boolean> => {
resolve(false);
}
const preds = R.map(requiredCodecs, (codec) => (available: any) =>
available[codec] && available[codec].canDemux && available[codec].canMux
const preds = R.map(
requiredCodecs,
(codec) => (available: any) =>
available[codec] &&
available[codec].canDemux &&
available[codec].canMux,
);
resolve(R.allPass(codecs, preds));
@ -79,6 +79,6 @@ export const assertFfmpegAvailable = async (): Promise<void> => {
const r = await selfCheck();
if (!r)
throw new Error(
`ffmpeg is not installed, could not be located, or does not support the required codecs: ${requiredCodecs}`
`ffmpeg is not installed, could not be located, or does not support the required codecs: ${requiredCodecs}`,
);
};

View file

@ -19,13 +19,11 @@ const notifyWebhooksTask = async (
for (const webhook of webhooks) {
const { endpointUrl, httpMethod, headers } = webhook;
const finalHeaders = { "Content-Type": "application/json", ...headers };
console.log({ endpointUrl, httpMethod, headers, finalHeaders });
const result = await fetch(endpointUrl, {
method: httpMethod,
headers: finalHeaders,
body: JSON.stringify(payload),
});
console.log(result);
}
};

View file

@ -31,7 +31,6 @@ const sendFacebookMessageTask = async (
headers: { "Content-Type": "application/json" },
body: JSON.stringify(outgoingMessage),
});
console.log({ response });
} catch (error) {
console.error({ error });
throw error;

View file

@ -46,7 +46,6 @@ const processMessage = async ({
message: msg,
}: ProcessMessageArgs): Promise<Record<string, any>[]> => {
const { envelope } = msg;
console.log(envelope);
const { source, sourceUuid, dataMessage } = envelope;
if (!dataMessage) return [];
@ -125,7 +124,6 @@ const fetchSignalMessagesTask = async ({
phoneNumber,
message,
});
console.log({ formattedMessages });
for (const formattedMessage of formattedMessages) {
if (formattedMessage.to !== formattedMessage.from) {
await worker.addJob(

View file

@ -36,7 +36,6 @@ const getZammadTickets = async (
{ headers },
);
const tickets: any = await rawTickets.json();
console.log({ tickets });
if (!tickets || tickets.length === 0) {
return [shouldContinue, docs];
}
@ -49,22 +48,8 @@ const getZammadTickets = async (
shouldContinue = true;
if (source_closed_at <= minUpdatedTimestamp) {
console.log(`Skipping ticket`, {
source_id,
source_updated_at,
source_closed_at,
minUpdatedTimestamp,
});
continue;
}
console.log(`Processing ticket`, {
source_id,
source_updated_at,
source_closed_at,
minUpdatedTimestamp,
});
const rawArticles = await fetch(
`${zammadApiUrl}/ticket_articles/by_ticket/${source_id}`,
{ headers },
@ -178,8 +163,6 @@ const sendToLabelStudio = async (tickets: FormattedZammadTicket[]) => {
body: JSON.stringify([ticket]),
});
const importResult = await res.json();
console.log(JSON.stringify(importResult, undefined, 2));
}
};
*/
@ -201,7 +184,6 @@ const importLabelStudioTask = async (): Promise<void> => {
await sendToLabelStudio(tickets);
const lastTicket = tickets.pop();
const newLastTimestamp = lastTicket.data.source_closed_at;
console.log({ newLastTimestamp });
await db.settings.upsert(settingName, {
minUpdatedTimestamp: newLastTimestamp,
});

View file

@ -43,14 +43,11 @@ const getLabelStudioTickets = async (
page_size: "50",
page: `${page}`,
});
console.log({ url: `${labelStudioApiUrl}/projects/1/tasks?${ticketsQuery}` });
const res = await fetch(
`${labelStudioApiUrl}/projects/1/tasks?${ticketsQuery}`,
{ headers },
);
console.log({ res });
const tasksResult: any = await res.json();
console.log({ tasksResult });
return tasksResult;
};
@ -63,14 +60,11 @@ const fetchFromLabelStudio = async (
for await (const page of pages) {
const docs = await getLabelStudioTickets(page + 1);
console.log({ page, docs });
if (docs && docs.length > 0) {
for (const doc of docs) {
const updatedAt = new Date(doc.updated_at);
console.log({ updatedAt, minUpdatedTimestamp });
if (updatedAt > minUpdatedTimestamp) {
console.log(`Adding doc`, { doc });
allDocs.push(doc);
}
}
@ -79,7 +73,6 @@ const fetchFromLabelStudio = async (
}
}
console.log({ allDocs });
return allDocs;
};
@ -93,9 +86,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
},
} = config;
console.log({ tickets });
const filteredTickets = tickets.filter((ticket) => ticket.is_labeled);
console.log({ filteredTickets });
const finalTickets: LeafcutterTicket[] = filteredTickets.map((ticket) => {
const {
id,
@ -131,8 +122,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
};
});
console.log("Sending to Leafcutter");
console.log({ finalTickets });
console.info("Sending to Leafcutter");
const result = await fetch(opensearchApiUrl, {
method: "POST",
@ -157,15 +147,7 @@ const importLeafcutterTask = async (): Promise<void> => {
? new Date(res.value.minUpdatedTimestamp as string)
: new Date("2023-03-01");
const newLastTimestamp = new Date();
console.log({
contributorName,
settingName,
res,
startTimestamp,
newLastTimestamp,
});
const tickets = await fetchFromLabelStudio(startTimestamp);
console.log({ tickets });
await sendToLeafcutter(tickets);
await db.settings.upsert(settingName, {
minUpdatedTimestamp: newLastTimestamp,

View file

@ -23,7 +23,6 @@ const receiveSignalMessageTask = async ({
filename,
mimeType,
}: ReceiveSignalMessageTaskOptions): Promise<void> => {
console.log({ token, to, from });
const worker = await getWorkerUtils();
const row = await db
.selectFrom("SignalBot")

View file

@ -13,7 +13,6 @@ const sendSignalMessageTask = async ({
to,
message,
}: SendSignalMessageTaskOptions): Promise<void> => {
console.log({ token, to });
const bot = await db
.selectFrom("SignalBot")
.selectAll()
@ -34,7 +33,6 @@ const sendSignalMessageTask = async ({
message,
},
});
console.log({ response });
} catch (error) {
console.error({ error });
throw error;

View file

@ -23,8 +23,6 @@ const receiveWhatsappMessageTask = async ({
filename,
mimeType,
}: ReceiveWhatsappMessageTaskOptions): Promise<void> => {
console.log({ token, to, from });
const worker = await getWorkerUtils();
const row = await db
.selectFrom("WhatsappBot")

View file

@ -25,7 +25,6 @@ const sendWhatsappMessageTask = async ({
headers: { "Content-Type": "application/json" },
body: JSON.stringify(params),
});
console.log({ result });
} catch (error) {
console.error({ error });
throw new Error("Failed to send message");

View file

@ -69,19 +69,17 @@ export const getServerSideProps: GetServerSideProps = async (
});
});
}
console.log({ query });
const dataResponse = await client.search({
index: "demo_data",
size: 200,
body: { query },
});
console.log({ dataResponse });
res.props.data = dataResponse.body.hits.hits.map((hit) => ({
id: hit._id,
...hit._source,
}));
console.log({ data: res.props.data });
console.log(res.props.data[0]);
return res;
};

View file

@ -22,20 +22,17 @@ export const authOptions: NextAuthOptions = {
Credentials({
name: "Link",
credentials: {
authToken: { label: "AuthToken", type: "text", },
authToken: { label: "AuthToken", type: "text" },
},
async authorize(credentials, req) {
const { headers } = req;
console.log({ headers });
const leafcutterUser = headers?.["x-leafcutter-user"];
const authToken = credentials?.authToken;
if (!leafcutterUser || leafcutterUser.trim() === "") {
console.log("no leafcutter user");
return null;
}
console.log({ authToken });
return null;
/*
try {
@ -48,14 +45,13 @@ export const authOptions: NextAuthOptions = {
return user;
} catch (e) {
console.log({ e });
console.error({ e });
}
return null;
*/
}
})
},
}),
],
secret: process.env.NEXTAUTH_SECRET,
/*
@ -77,4 +73,3 @@ export const authOptions: NextAuthOptions = {
}
},*/
};

View file

@ -302,8 +302,7 @@ export const updateUserVisualization = async (
body,
});
} catch (e) {
// eslint-disable-next-line no-console
console.log({ e });
console.error({ e });
}
return id;

View file

@ -2,14 +2,12 @@ import { NextRequest, NextResponse } from "next/server";
export const GET = async (req: NextRequest) => {
const validDomains = "localhost";
console.log({ req });
return NextResponse.json({ response: "ok" });
};
export const POST = async (req: NextRequest) => {
const validDomains = "localhost";
console.log({ req });
return NextResponse.json({ response: "ok" });
};

View file

@ -3,9 +3,8 @@ import { getTrends } from "app/_lib/opensearch";
export const GET = async () => {
const results = await getTrends(5);
console.log({ results });
NextResponse.json(results);
};
export const dynamic = 'force-dynamic';
export const dynamic = "force-dynamic";

View file

@ -15,8 +15,8 @@ export const POST = async (req: NextRequest) => {
rejectUnauthorized: false,
},
headers: {
authorization
}
authorization,
},
});
const succeeded = [];
@ -28,11 +28,15 @@ export const POST = async (req: NextRequest) => {
const country = ticket.country[0] ?? "none";
// @ts-expect-error
const translatedCountry = taxonomy.country[country]?.display ?? "none";
const countryDetails: any = unRegions.find((c) => c.name === translatedCountry);
const countryDetails: any = unRegions.find(
(c) => c.name === translatedCountry,
);
const augmentedTicket = {
...ticket,
region: countryDetails['sub-region']?.toLowerCase().replace(" ", "-") ?? null,
continent: countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
region:
countryDetails["sub-region"]?.toLowerCase().replace(" ", "-") ?? null,
continent:
countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
};
const out = await client.create({
id: uuid(),
@ -40,10 +44,9 @@ export const POST = async (req: NextRequest) => {
refresh: true,
body: augmentedTicket,
});
console.log(out);
succeeded.push(id);
} catch (e) {
console.log(e);
console.error(e);
failed.push(id);
}
}
@ -52,4 +55,3 @@ export const POST = async (req: NextRequest) => {
return NextResponse.json(results);
};

View file

@ -3,4 +3,4 @@
/// <reference types="next/navigation-types/compat/navigation" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

View file

@ -24,17 +24,17 @@ const withAuthInfo =
const requestSignature = req.query.signature;
const url = new URL(req.headers.referer as string);
const referrerSignature = url.searchParams.get("signature");
console.log({ requestSignature, referrerSignature });
const isAppPath = !!req.url?.startsWith("/app");
const isResourcePath = !!req.url?.match(/\/(api|app|bootstrap|3961|ui|translations|internal|login|node_modules)/);
const isResourcePath = !!req.url?.match(
/\/(api|app|bootstrap|3961|ui|translations|internal|login|node_modules)/,
);
if (requestSignature && isAppPath) {
console.log("Has Signature");
console.info("Has Signature");
}
if (referrerSignature && isResourcePath) {
console.log("Has Signature");
console.info("Has Signature");
}
if (!email) {

View file

@ -41,7 +41,6 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
method: "GET",
redirect: "manual",
});
console.log({ res });
if (res.type === "opaqueredirect") {
setAuthenticated(true);
} else {

View file

@ -156,14 +156,12 @@ export const getTicketStatesAction = async () => {
const states = await executeREST({
path: "/api/v1/ticket_states",
});
console.log({ states });
const formattedStates =
states?.map((state: any) => ({
value: `gid://zammad/Ticket::State/${state.id}`,
label: state.name,
disabled: ["new", "merged", "removed"].includes(state.name),
})) ?? [];
console.log({ formattedStates });
return formattedStates;
} catch (e) {
console.error(e.message);

View file

@ -46,7 +46,7 @@ const getUserRoles = async (email: string) => {
});
return roles.filter((role: string) => role !== null);
} catch (e) {
console.log({ e });
console.error({ e });
return [];
}
};

View file

@ -13,21 +13,18 @@ export const fetchLeafcutter = async (url: string, options: any) => {
const json = await res.json();
return json;
} catch (error) {
console.log({ error });
console.error({ error });
return null;
}
};
const data = await fetchData(url, options);
console.log({ data });
if (!data) {
const csrfURL = `${process.env.NEXT_PUBLIC_LEAFCUTTER_URL}/api/auth/csrf`;
const csrfData = await fetchData(csrfURL, {});
console.log({ csrfData });
const authURL = `${process.env.NEXT_PUBLIC_LEAFCUTTER_URL}/api/auth/callback/credentials`;
const authData = await fetchData(authURL, { method: "POST" });
console.log({ authData });
if (!authData) {
return null;
} else {
@ -37,5 +34,3 @@ export const fetchLeafcutter = async (url: string, options: any) => {
return data;
}
};

View file

@ -12,7 +12,7 @@ const rewriteURL = (
path = path.slice(1);
}
const destinationURL = `${destinationBaseURL}/${path}`;
console.log(`Rewriting ${request.url} to ${destinationURL}`);
console.info(`Rewriting ${request.url} to ${destinationURL}`);
const requestHeaders = new Headers(request.headers);
requestHeaders.delete("x-forwarded-user");

View file

@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

View file

@ -21,9 +21,9 @@ const finalCommand = command === "up" ? ["up", "-d", "--remove-orphans"] : [comm
const dockerCompose = spawn('docker', ['compose', '--env-file', '.env', ...finalFiles, ...finalCommand]);
dockerCompose.stdout.on('data', (data) => {
console.log(`${data}`);
console.info(`${data}`);
});
dockerCompose.stderr.on('data', (data) => {
console.log(`${data}`);
console.info(`${data}`);
});

15
package-lock.json generated
View file

@ -17279,6 +17279,21 @@
"dependencies": {
"@link-stack/zammad-addon-common": "*"
}
},
"node_modules/@next/swc-win32-ia32-msvc": {
"version": "14.2.13",
"resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.13.tgz",
"integrity": "sha512-V26ezyjPqQpDBV4lcWIh8B/QICQ4v+M5Bo9ykLN+sqeKKBxJVDpEc6biDVyluTXTC40f5IqCU0ttth7Es2ZuMw==",
"cpu": [
"ia32"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10"
}
}
}
}

View file

@ -30,7 +30,6 @@ export const QRCode: FC<QRCodeProps> = ({
if (!verified && getValue && refreshInterval) {
const interval = setInterval(async () => {
const { qr, kind } = await getValue(token);
console.log({ kind });
setValue(qr);
setKind(kind);
}, refreshInterval * 1000);

View file

@ -101,7 +101,6 @@ export class Service {
},
};
console.log(response);
return NextResponse.json(response);
}

View file

@ -21,7 +21,6 @@ export const Home: FC<HomeProps> = ({
visualizations = [],
showWelcome = true,
}) => {
console.log("Home", visualizations);
const router = useRouter();
const pathname = usePathname() ?? "";
const cookieName = "homeIntroComplete";

View file

@ -25,7 +25,6 @@ export const VisualizationDetail: FC<VisualizationDetailProps> = ({
typography: { h4, p },
} = useLeafcutterContext();
const finalURL = `${url}&_g=(filters%3A!()%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-3y%2Cto%3Anow))`;
console.log({ finalURL });
return (
<Box key={id}>
{!editing ? (

View file

@ -284,7 +284,7 @@ export const updateUserVisualization = async (
});
} catch (e) {
// eslint-disable-next-line no-console
console.log({ e });
console.error({ e });
}
return id;
@ -620,7 +620,6 @@ export const performZammadQuery = async (searchQuery: any, limit: number) => {
hits: { hits },
} = dataResponse.body;
const results = hits.map((hit: any) => {
console.log(hit);
return {
...hit._source,
id: hit._id,

View file

@ -59,7 +59,6 @@ export const MultiValueField: FC<MultiValueFieldProps> = ({
newFields[index][position] = value;
setFields(newFields);
// formState.values[name] = Object.fromEntries(newFields);
// console.log(formState.values);
};
return (

View file

@ -6,7 +6,7 @@ import path from "path";
import os from "os";
const packageFile = async (actualPath: string): Promise<any> => {
console.log(`Packaging: ${actualPath}`);
console.info(`Packaging: ${actualPath}`);
const packagePath = actualPath.slice(4);
const data = await fs.readFile(actualPath, "utf-8");
const content = Buffer.from(data, "utf-8").toString("base64");
@ -74,7 +74,7 @@ export const createZPM = async ({
for (const file of files) {
await fs.unlink(file);
console.log(`${file} was deleted`);
console.info(`${file} was deleted`);
}
} catch (err) {
console.error(err);
@ -89,7 +89,7 @@ export const createZPM = async ({
const main = async () => {
const packageJSON = JSON.parse(await fs.readFile("./package.json", "utf-8"));
const { name: fullName, displayName, version } = packageJSON;
console.log(`Building addon ${displayName} v${version}`);
console.info(`Building addon ${displayName} v${version}`);
const name = fullName.split("/").pop();
await createZPM({ name, displayName, version });
};

View file

@ -53,4 +53,4 @@ if (!re.test(name))
throw new Error("Name must be only alphanumeric and start with a letter");
const res = migration(name, ups, downs);
console.log(res);
console.info(res);