Use debug package for logging

This commit is contained in:
Tau
2019-11-06 17:28:30 -05:00
parent db260d5f2f
commit 9697b4b06e
21 changed files with 110 additions and 60 deletions
+8 -1
View File
@@ -1,7 +1,10 @@
import logger from "debug";
import { Transform } from "stream";
import * as Request from "./request";
const debug = logger("app:aimedb:decoder");
function begin(msg: Buffer): Request.AimeRequestBase {
const gameId = msg.toString("ascii", 0x000a, 0x000e);
const keychipId = msg.toString("ascii", 0x0014, 0x001f);
@@ -116,6 +119,10 @@ export class Decoder extends Transform {
);
}
return callback(null, reader(msg));
const obj = reader(msg);
debug(`Decode ${JSON.stringify(obj)}`);
return callback(null, obj);
}
}
+5 -2
View File
@@ -1,7 +1,10 @@
import logger from "debug";
import { Transform } from "stream";
import { AimeResponse, RegisterLevel } from "./response";
const debug = logger("app:aimedb:encoder");
const registerLevels = new Map<RegisterLevel, number>();
registerLevels.set("none", 0);
@@ -27,7 +30,7 @@ export class Encoder extends Transform {
}
_transform(msg: AimeResponse, encoding, callback) {
console.log("Aimedb: Encode", msg);
debug(`Encode ${JSON.stringify(msg)}`);
let buf: Buffer;
@@ -105,7 +108,7 @@ export class Encoder extends Transform {
return callback(new Error("Unimplemented response type"));
}
console.log("Aimedb: Send", buf.toString("hex"));
debug(`Send ${buf.toString("hex")}`);
return callback(null, buf);
}
+4 -1
View File
@@ -1,5 +1,8 @@
import logger from "debug";
import { Transform } from "stream";
const debug = logger("app:aimedb:frame");
export class Deframer extends Transform {
private state: Buffer;
@@ -33,7 +36,7 @@ export class Deframer extends Transform {
const frame = this.state.slice(0, len);
console.log("Aimedb: Recv", frame.toString("hex"));
debug(`Recv ${frame.toString("hex")}`);
this.state = this.state.slice(len);
+12 -8
View File
@@ -1,13 +1,17 @@
import logger from "debug";
import { Repositories } from "./repo";
import * as Req from "./request";
import * as Res from "./response";
const debug = logger("app:aimedb:ops");
function hello(
rep: Repositories,
req: Req.HelloRequest,
now: Date
): Res.HelloResponse {
console.log("Aimedb: Hello");
debug("Hello");
return { type: req.type, status: 1 };
}
@@ -17,7 +21,7 @@ function campaign(
req: Req.CampaignRequest,
now: Date
): Res.CampaignResponse {
console.log("Aimedb: Campaign stuff");
debug("Campaign stuff");
return { type: req.type, status: 1 };
}
@@ -27,7 +31,7 @@ function feliCaLookup(
req: Req.FeliCaLookupRequest,
now: Date
): Res.FeliCaLookupResponse {
console.log("Aimedb: FeliCa access code lookup");
debug("FeliCa access code lookup");
// Well, this access code transformation is the million dollar question eh
// Return a decimal representation for now.
@@ -47,7 +51,7 @@ async function lookup(
req: Req.LookupRequest,
now: Date
): Promise<Res.LookupResponse> {
console.log("Aimedb: Mifare lookup v1", req.luid);
debug(`Mifare lookup v1: luid=${req.luid}`);
return {
type: req.type,
@@ -62,7 +66,7 @@ async function lookup2(
req: Req.LookupRequest2,
now: Date
): Promise<Res.LookupResponse2> {
console.log("Aimedb: Mifare lookup v2", req.luid);
debug(`Mifare lookup v2: luid=${req.luid}`);
return {
type: req.type,
@@ -77,7 +81,7 @@ async function register(
req: Req.RegisterRequest,
now: Date
): Promise<Res.RegisterResponse> {
console.log("Aimedb: Mifare register", req.luid);
debug(`User register: luid=${req.luid}`);
return {
type: req.type,
@@ -91,7 +95,7 @@ function log(
req: Req.LogRequest,
now: Date
): Res.LogResponse {
console.log("Aimedb: Log message");
debug("Log message");
return { type: req.type, status: 1 };
}
@@ -124,7 +128,7 @@ export async function dispatch(
return log(rep, req, now);
case "goodbye":
console.log("Aimedb: Goodbye");
debug("Goodbye");
return undefined;
+7 -6
View File
@@ -1,3 +1,4 @@
import logger from "debug";
import { Socket } from "net";
import { dispatch } from "./handler";
@@ -5,22 +6,22 @@ import { AimeRequest } from "./request";
import { setup } from "./pipeline";
import { beginDbSession } from "./db";
const debug = logger("app:aimedb:session");
export default async function aimedb(socket: Socket) {
console.log("Aimedb: Connection opened");
debug("Connection opened");
const { input, output } = setup(socket);
const txn = await beginDbSession();
try {
for await (const obj of input) {
console.log("Aimedb: Decode", obj);
const now = new Date();
const req = obj as AimeRequest;
const res = await dispatch(txn, req, now);
if (res === undefined) {
console.log("Aimedb: Closing connection");
debug("Closing connection");
break;
}
@@ -30,10 +31,10 @@ export default async function aimedb(socket: Socket) {
await txn.commit();
} catch (e) {
console.log("Aimedb: Connection error:\n", e);
debug(`Connection error:\n${e.toString()}\n`);
await txn.rollback();
}
console.log("Aimedb: Connection closed\n");
debug("Connection closed");
socket.end();
}