@effect-app/infra 0.164.3 → 0.164.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +17 -0
- package/_cjs/api/routing/base.cjs +5 -5
- package/_cjs/api/routing/base.cjs.map +1 -1
- package/_cjs/api/routing/defaultErrorHandler.cjs +1 -1
- package/_cjs/api/routing/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/routing/makeRequestHandler.cjs +9 -10
- package/_cjs/api/routing/makeRequestHandler.cjs.map +1 -1
- package/_cjs/api/setupRequest.cjs +5 -5
- package/_cjs/api/setupRequest.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +1 -2
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/logger/jsonLogger.cjs +10 -11
- package/_cjs/logger/jsonLogger.cjs.map +1 -1
- package/_cjs/logger/logFmtLogger.cjs +8 -9
- package/_cjs/logger/logFmtLogger.cjs.map +1 -1
- package/_cjs/logger/shared.cjs +1 -2
- package/_cjs/logger/shared.cjs.map +1 -1
- package/_cjs/rateLimit.cjs +6 -6
- package/_cjs/rateLimit.cjs.map +1 -1
- package/_cjs/services/Operations/live.cjs +3 -3
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Operations/service.cjs +3 -3
- package/_cjs/services/Operations/service.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +11 -12
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/Repository.cjs +12 -13
- package/_cjs/services/Repository.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +45 -46
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/RequestContextContainer.cjs +4 -4
- package/_cjs/services/RequestContextContainer.cjs.map +1 -1
- package/_cjs/services/Store/ContextMapContainer.cjs +1 -1
- package/_cjs/services/Store/ContextMapContainer.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +15 -16
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +5 -5
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +43 -44
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/Redis.cjs +5 -6
- package/_cjs/services/Store/Redis.cjs.map +1 -1
- package/_cjs/services/Store/codeFilter.test.cjs +13 -14
- package/_cjs/services/Store/codeFilter.test.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +2 -3
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/_cjs/services/simpledb/cosmosdb.cjs +3 -3
- package/_cjs/services/simpledb/cosmosdb.cjs.map +1 -1
- package/_cjs/services/simpledb/diskdb.cjs +14 -14
- package/_cjs/services/simpledb/diskdb.cjs.map +1 -1
- package/_cjs/services/simpledb/memdb.cjs +11 -11
- package/_cjs/services/simpledb/memdb.cjs.map +1 -1
- package/_cjs/services/simpledb/mongodb.cjs +2 -2
- package/_cjs/services/simpledb/mongodb.cjs.map +1 -1
- package/_cjs/services/simpledb/redisdb.cjs +2 -2
- package/_cjs/services/simpledb/redisdb.cjs.map +1 -1
- package/_cjs/services/simpledb/simpledb.cjs +5 -5
- package/_cjs/services/simpledb/simpledb.cjs.map +1 -1
- package/dist/api/routing/base.js +16 -6
- package/dist/api/routing/defaultErrorHandler.js +2 -2
- package/dist/api/routing/makeRequestHandler.js +13 -11
- package/dist/api/setupRequest.js +10 -7
- package/dist/errorReporter.js +2 -3
- package/dist/logger/jsonLogger.js +11 -12
- package/dist/logger/logFmtLogger.js +10 -11
- package/dist/logger/shared.js +2 -3
- package/dist/rateLimit.js +11 -7
- package/dist/services/Operations/live.js +8 -5
- package/dist/services/Operations/service.js +11 -7
- package/dist/services/QueueMaker/memQueue.js +11 -11
- package/dist/services/QueueMaker/service.d.ts +2 -2
- package/dist/services/Repository.js +14 -14
- package/dist/services/RepositoryBase.js +50 -47
- package/dist/services/RequestContextContainer.js +5 -4
- package/dist/services/Store/ContextMapContainer.js +3 -2
- package/dist/services/Store/Cosmos.js +27 -20
- package/dist/services/Store/Disk.js +7 -6
- package/dist/services/Store/Memory.js +52 -47
- package/dist/services/Store/Redis.js +10 -8
- package/dist/services/Store/utils.js +5 -5
- package/dist/services/simpledb/cosmosdb.js +4 -4
- package/dist/services/simpledb/diskdb.js +22 -20
- package/dist/services/simpledb/memdb.js +15 -13
- package/dist/services/simpledb/mongodb.js +6 -3
- package/dist/services/simpledb/redisdb.d.ts +3 -3
- package/dist/services/simpledb/redisdb.js +5 -3
- package/dist/services/simpledb/shared.d.ts +5 -5
- package/dist/services/simpledb/simpledb.js +9 -6
- package/package.json +5 -5
|
@@ -16,7 +16,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
16
16
|
// prev[cur] = 1
|
|
17
17
|
// return prev
|
|
18
18
|
// }, {} as Record<string, number>)
|
|
19
|
-
const setup = (type, indexes) => tsplus_module_1.flatMap(
|
|
19
|
+
const setup = (type, indexes) => tsplus_module_1.flatMap(_mongoClient.MongoClient.tap(({
|
|
20
20
|
db
|
|
21
21
|
}) => tsplus_module_1.tryPromise(() => db.createCollection(type).catch(err => console.warn(err)))), ({
|
|
22
22
|
db
|
|
@@ -58,7 +58,7 @@ function createContext() {
|
|
|
58
58
|
}
|
|
59
59
|
function store(record, currentVersion) {
|
|
60
60
|
return tsplus_module_1.gen(function* ($) {
|
|
61
|
-
const version =
|
|
61
|
+
const version = currentVersion.map(cv => (parseInt(cv) + 1).toString()).getOrElse(() => "1");
|
|
62
62
|
const {
|
|
63
63
|
db
|
|
64
64
|
} = yield* $(_mongoClient.MongoClient);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb.cjs","names":["_mongoClient","require","_shared","simpledb","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setup","type","indexes","tsplus_module_1","flatMap","
|
|
1
|
+
{"version":3,"file":"mongodb.cjs","names":["_mongoClient","require","_shared","simpledb","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setup","type","indexes","tsplus_module_1","flatMap","MongoClient","tap","db","tryPromise","createCollection","catch","err","console","warn","collection","createIndexes","createContext","encode","decode","map","find","findBy","save","storeDirectly","store","id","tsplus_module_3","mapOption","findOne","_id","equals","tsplus_module_2","fromNullable","data","version","keys","projection","record","currentVersion","gen","$","cv","parseInt","toString","getOrElse","match","onNone","orDie","asUnit","insertOne","timestamp","Date","checkKeys","onSome","replaceOne","upsert","x","modifiedCount","OptimisticLockException","unit"],"sources":["../../../_src/services/simpledb/mongodb.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ function createContext() {
|
|
|
38
38
|
})), e => new _shared.ConnectionException(new Error(e.toString())))));
|
|
39
39
|
}
|
|
40
40
|
function store(record, currentVersion) {
|
|
41
|
-
const version =
|
|
41
|
+
const version = currentVersion.map(cv => (parseInt(cv) + 1).toString()).getOrElse(() => "1");
|
|
42
42
|
return tsplus_module_4.match(currentVersion, {
|
|
43
43
|
onNone: () => tsplus_module_1.scoped(tsplus_module_1.zipRight(lockIndex(record), tsplus_module_1.map(tsplus_module_1.orDie(tsplus_module_1.zipRight(tsplus_module_1.flatMap(tsplus_module_1.zipRight(tsplus_module_3.zipRightOption(getIndex(record), tsplus_module_1.fail(() => new Error("Combination already exists, abort"))), getData(record))
|
|
44
44
|
// TODO: instead use MULTI & EXEC to make it in one command?
|
|
@@ -73,7 +73,7 @@ function createContext() {
|
|
|
73
73
|
return lockRedisIdx(index);
|
|
74
74
|
}
|
|
75
75
|
function getIdx(index) {
|
|
76
|
-
return tsplus_module_1.flatMap(_redisClient.RedisClient, _ => tsplus_module_1.map(_.hget(getIdxKey(index), index.key), _ =>
|
|
76
|
+
return tsplus_module_1.flatMap(_redisClient.RedisClient, _ => tsplus_module_1.map(_.hget(getIdxKey(index), index.key), _ => _.map(i => i)));
|
|
77
77
|
}
|
|
78
78
|
function setIdx(index, r) {
|
|
79
79
|
return tsplus_module_1.flatMap(_redisClient.RedisClient, _ => _.hset(getIdxKey(index), index.key, r.id));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisdb.cjs","names":["_Function","require","_redisClient","S","_interopRequireWildcard","_shared","simpledb","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ttl","createContext","type","encode","decode","schemaVersion","makeIndexKey","getData","flow","_","tsplus_module_1","map","JSON","stringify","find","findByIndex","getIdx","save","store","lockRedisRecord","id","orDie","tsplus_module_3","flatMapOption","flatMap","RedisClient","hmgetAll","getKey","v","mapError","tsplus_module_2","decodeUnknown","RedisSerializedDBRecord","data","version","parse","ConnectionException","Error","toString","record","currentVersion","
|
|
1
|
+
{"version":3,"file":"redisdb.cjs","names":["_Function","require","_redisClient","S","_interopRequireWildcard","_shared","simpledb","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ttl","createContext","type","encode","decode","schemaVersion","makeIndexKey","getData","flow","_","tsplus_module_1","map","JSON","stringify","find","findByIndex","getIdx","save","store","lockRedisRecord","id","orDie","tsplus_module_3","flatMapOption","flatMap","RedisClient","hmgetAll","getKey","v","mapError","tsplus_module_2","decodeUnknown","RedisSerializedDBRecord","data","version","parse","ConnectionException","Error","toString","record","currentVersion","cv","parseInt","getOrElse","tsplus_module_4","match","onNone","scoped","zipRight","lockIndex","zipRightOption","getIndex","fail","hmSetRec","timestamp","Date","setIndex","onSome","index","setIdx","lockRedisIdx","hget","getIdxKey","key","hset","lockKey","getIdxLockKey","acquireRelease","mapBoth","lock","tryPromise","onFailure","err","CouldNotAquireDbLockException","onSuccess","release","unlock","l","getLockKey","getRecordName","getIndexName","doc","val","enc","tsplus_module_5","encodeSync","client","uninterruptible","async","res","hmset","sync","Class","string","exports"],"sources":["../../../_src/services/simpledb/redisdb.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -64,19 +64,19 @@ function find(tryRead, decode, type) {
|
|
|
64
64
|
}
|
|
65
65
|
function storeDirectly(save, type) {
|
|
66
66
|
const getCache = getM(type);
|
|
67
|
-
return record => getCache(c => tsplus_module_1.map(tsplus_module_1.
|
|
67
|
+
return record => getCache(c => tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_4.mapOption(c.find(record.id), x => x.version), cv => save(record, cv)).tap(r => c.set(record.id, r)), r => r.data));
|
|
68
68
|
}
|
|
69
69
|
function store(tryRead, save, lock, type) {
|
|
70
70
|
const getCache = getM(type);
|
|
71
|
-
return record => getCache(c => tsplus_module_1.map(tsplus_module_1.
|
|
71
|
+
return record => getCache(c => tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_4.mapOption(c.find(record.id), x => x.version), _ => tsplus_module_6.match(_, {
|
|
72
72
|
onNone: () => save(record, tsplus_module_5.none),
|
|
73
73
|
onSome: confirmVersionAndSave(record)
|
|
74
|
-
}))
|
|
74
|
+
})).tap(r => c.set(record.id, r)), r => r.data));
|
|
75
75
|
function confirmVersionAndSave(record) {
|
|
76
|
-
return cv => tsplus_module_1.scoped(tsplus_module_1.zipRight(lock(record.id), tsplus_module_1.zipRight(tsplus_module_1.
|
|
76
|
+
return cv => tsplus_module_1.scoped(tsplus_module_1.zipRight(lock(record.id), tsplus_module_1.zipRight(tsplus_module_1.flatMap(tryRead(record.id), _ => tsplus_module_6.match(_, {
|
|
77
77
|
onNone: () => tsplus_module_1.fail(new InvalidStateError("record is gone")),
|
|
78
78
|
onSome: tsplus_module_1.succeed
|
|
79
|
-
}))
|
|
79
|
+
})).tap(({
|
|
80
80
|
version
|
|
81
81
|
}) => version !== cv ? new _shared.OptimisticLockException(type, record.id) : tsplus_module_1.unit), save(record, tsplus_module_6.some(cv)))));
|
|
82
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simpledb.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","InvalidStateError","constructor","message","details","_tag","exports","makeLiveRecordCache","m","Map","type","tsplus_module_1","sync","ex","nm","makeMap","RecordCache","tsplus_module_2","Tag","LiveRecordCache","tsplus_module_3","effect","getM","eff","gen","$","flatMap","find","tryRead","decode","getCache","read","id","tsplus_module_4","mapOption","tapOption","flatMapOption","data","version","mapBoth","onFailure","err","onSuccess","c","orElse","existing","storeDirectly","save","record","map","
|
|
1
|
+
{"version":3,"file":"simpledb.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","InvalidStateError","constructor","message","details","_tag","exports","makeLiveRecordCache","m","Map","type","tsplus_module_1","sync","ex","nm","makeMap","RecordCache","tsplus_module_2","Tag","LiveRecordCache","tsplus_module_3","effect","getM","eff","gen","$","flatMap","find","tryRead","decode","getCache","read","id","tsplus_module_4","mapOption","tapOption","flatMapOption","data","version","mapBoth","onFailure","err","onSuccess","c","orElse","existing","storeDirectly","save","record","map","x","cv","tap","store","lock","_","tsplus_module_6","match","onNone","tsplus_module_5","none","onSome","confirmVersionAndSave","scoped","zipRight","fail","succeed","OptimisticLockException","unit","some"],"sources":["../../../_src/services/simpledb/simpledb.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/dist/api/routing/base.js
CHANGED
|
@@ -116,15 +116,25 @@ export function respondSuccess(encodeResponse) {
|
|
|
116
116
|
})));
|
|
117
117
|
}
|
|
118
118
|
export function makeRequestParsers(Request) {
|
|
119
|
-
const ph = tsplus_module_1.sync(() => tsplus_module_5.
|
|
119
|
+
const ph = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Headers)
|
|
120
|
+
.map((s) => s)
|
|
121
|
+
.map(S.decodeUnknown));
|
|
120
122
|
const parseHeaders = (u) => tsplus_module_6.flatMapOption(ph, (d) => d(u));
|
|
121
|
-
const pq = tsplus_module_1.sync(() => tsplus_module_5.
|
|
123
|
+
const pq = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Query)
|
|
124
|
+
.map((s) => s)
|
|
125
|
+
.map(S.decodeUnknown));
|
|
122
126
|
const parseQuery = (u) => tsplus_module_6.flatMapOption(pq, (d) => d(u));
|
|
123
|
-
const pb = tsplus_module_1.sync(() => tsplus_module_5.
|
|
127
|
+
const pb = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Body)
|
|
128
|
+
.map((s) => s)
|
|
129
|
+
.map(S.decodeUnknown));
|
|
124
130
|
const parseBody = (u) => tsplus_module_6.flatMapOption(pb, (d) => d(u));
|
|
125
|
-
const pp = tsplus_module_1.sync(() => tsplus_module_5.
|
|
131
|
+
const pp = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Path)
|
|
132
|
+
.map((s) => s)
|
|
133
|
+
.map(S.decodeUnknown));
|
|
126
134
|
const parsePath = (u) => tsplus_module_6.flatMapOption(pp, (d) => d(u));
|
|
127
|
-
const pc = tsplus_module_1.sync(() => tsplus_module_5.
|
|
135
|
+
const pc = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Cookie)
|
|
136
|
+
.map((s) => s)
|
|
137
|
+
.map(S.decodeUnknown));
|
|
128
138
|
const parseCookie = (u) => tsplus_module_6.flatMapOption(pc, (d) => d(u));
|
|
129
139
|
return {
|
|
130
140
|
parseBody,
|
|
@@ -134,4 +144,4 @@ export function makeRequestParsers(Request) {
|
|
|
134
144
|
parseQuery
|
|
135
145
|
};
|
|
136
146
|
}
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../_src/api/routing/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export function defaultErrorHandler(req, res, r2) {
|
|
|
22
22
|
const r3 = req.method === "PATCH"
|
|
23
23
|
? tsplus_module_4.retry(r2, optimisticConcurrencySchedule)
|
|
24
24
|
: r2;
|
|
25
|
-
const sendError = (code, schema) => (body) => tsplus_module_4.
|
|
25
|
+
const sendError = (code, schema) => (body) => tsplus_module_4.orDie(tsplus_module_7.encode(schema)(body)).andThen((body) => tsplus_module_3.setBody(tsplus_module_3.setStatus(code)(res), tsplus_module_2.unsafeJson(body)));
|
|
26
26
|
return tsplus_module_4.catchAll(tsplus_module_4.catchTags(tsplus_module_4.tapErrorCause(r3, (cause) => tsplus_module_5.isFailure(cause) ? logRequestError(cause) : tsplus_module_4.unit), {
|
|
27
27
|
"JWTError": (err) => tsplus_module_4.succeed(tsplus_module_3.unsafeJson({ message: err.error.message }, {
|
|
28
28
|
status: err
|
|
@@ -41,4 +41,4 @@ export function defaultErrorHandler(req, res, r2) {
|
|
|
41
41
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
42
42
|
, (err) => tsplus_module_4.flatMap(tsplus_module_4.map(tsplus_module_4.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_4.die));
|
|
43
43
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL3JvdXRpbmcvZGVmYXVsdEVycm9ySGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlDQUFpQyxDQUFBO0FBRTFELE9BQU8sRUFDTCxpQkFBaUIsRUFDakIsYUFBYSxFQUNiLGdCQUFnQixFQUNoQiw4QkFBOEIsRUFDOUIsaUJBQWlCLEVBQ2pCLGVBQWUsRUFDaEIsTUFBTSxtQ0FBbUMsQ0FBQTtBQUMxQyxPQUFPLEVBQVksV0FBVyxFQUFtRCxNQUFNLFlBQVksQ0FBQTtBQVNuRyxNQUFNLE9BQU8sUUFBUyxTQUFRLDRCQUFpQixVQUFVLENBTXZEO0NBQUc7QUFFTCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFM0MsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxJQUF1QixFQUN2QixHQUF1QixFQUN2QixFQUFrRDtJQUVsRCxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFhLEVBQUUsRUFBRSxDQUNwRCxxQkFBWSxHQUFHLEVBQUUsQ0FBQywwQkFBaUQsSUFBSSxFQUFyRCx3QkFBQSxHQUFHLEVBQVMsMkJBQW9CLElBQUksQ0FBQyxDQUFDLENBQWdCLENBQUMsQ0FBQTtJQUMzRSxPQUFPLHlCQUFBLHlCQUFBLDhCQUFBLEVBQUUsRUFDUSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDekUsaUJBQWlCLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakUsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBRUksZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNJLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sNkJBQTZCLEdBQUcsd0JBQ2pDLDJCQUFnRCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxnQ0FBZ0MsQ0FBQyxDQUFBO0FBRXhHLE1BQU0sVUFBVSxtQkFBbUIsQ0FDakMsR0FBc0IsRUFDdEIsR0FBdUIsRUFDdkIsRUFBNkQ7SUFFN0QsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sS0FBSyxPQUFPO1FBQy9CLENBQUMsQ0FBQyxzQkFBQSxFQUFFLEVBQU8sNkJBQTZCLENBQUM7UUFDekMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUNOLE1BQU0sU0FBUyxHQUFHLENBQWMsSUFBWSxFQUFFLE1BQTJCLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBUSxFQUFFLEVBQUUsQ0FDekYsc0JBQUEsdUJBQUEsTUFBTSxFQUNJLElBQUksQ0FBQyxFQUVaLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQ2hCLHdCQUFBLDBCQUNhLElBQUksRUFEakIsR0FBRyxDQUNlLEVBQ1AsMkJBQW9CLElBQUksQ0FBQyxDQUFDLENBQ3RDLENBQUE7SUFDTCxPQUFPLHlCQUFBLDBCQUFBLDhCQUFBLEVBQUUsRUFDUSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDeEU7UUFDVCxVQUFVLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNsQix3QkFDRSwyQkFBOEIsRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUM1RCxNQUFNLEVBQUUsR0FBRztpQkFDUixLQUFLO2lCQUNMLE1BQU07WUFDVCxPQUFPLEVBQUUsV0FBVyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQztTQUNsRCxDQUFDLENBQ0g7UUFDSCxpQkFBaUIsRUFBRSxTQUFTLENBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQztRQUNsRCxlQUFlLEVBQUUsU0FBUyxDQUFDLEdBQUcsRUFBRSxhQUFhLENBQUM7UUFDOUMsa0JBQWtCLEVBQUUsU0FBUyxDQUFDLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQztRQUNwRCxtQkFBbUIsRUFBRSxTQUFTLENBQUMsR0FBRyxFQUFFLGlCQUFpQixDQUFDO1FBQ3RELG1CQUFtQixFQUFFLFNBQVMsQ0FBQyxHQUFHLEVBQUUsaUJBQWlCLENBQUM7UUFDdEQsNElBQTRJO1FBQzVJLGdDQUFnQyxFQUFFLFNBQVMsQ0FBQyxHQUFHLEVBQUUsOEJBQThCLENBQUM7S0FDakYsQ0FBQztJQUNGLCtFQUErRTtNQUNyRSxDQUFDLEdBQVUsRUFBRSxFQUFFLENBQ3ZCLHdCQUFBLG9CQUFBLHlCQUVJLGdHQUFnRyxHQUFHLEdBQUcsQ0FDdkcsRUFDSSxHQUFHLEVBQUUsQ0FBQyxHQUFjLENBQUMsc0JBQ04sQ0FDdkIsQ0FBQTtBQUNMLENBQUMifQ==
|
|
@@ -5,8 +5,7 @@ import * as tsplus_module_4 from "effect/Effect";
|
|
|
5
5
|
import * as tsplus_module_5 from "@effect-app/prelude/utils";
|
|
6
6
|
import * as tsplus_module_6 from "@effect/platform/Http/ServerResponse";
|
|
7
7
|
import * as tsplus_module_7 from "@effect/platform/Http/Body";
|
|
8
|
-
import * as tsplus_module_8 from "@effect-app/
|
|
9
|
-
import * as tsplus_module_9 from "@effect-app/infra/api/setupRequest";
|
|
8
|
+
import * as tsplus_module_8 from "@effect-app/infra/api/setupRequest";
|
|
10
9
|
import { pretty } from "@effect-app/core/utils";
|
|
11
10
|
import { snipString } from "@effect-app/infra/api/util";
|
|
12
11
|
import { reportError } from "@effect-app/infra/errorReporter";
|
|
@@ -42,7 +41,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
42
41
|
headers: req.headers,
|
|
43
42
|
cookies: {} // req.cookies
|
|
44
43
|
}));
|
|
45
|
-
return
|
|
44
|
+
return tsplus_module_8.updateRequestContext(tsplus_module_4.gen(function* ($) {
|
|
46
45
|
const req = yield* $(HttpServerRequest);
|
|
47
46
|
const res = tsplus_module_6.empty()
|
|
48
47
|
.pipe((_) => req.method === "GET" ? tsplus_module_6.setHeader(_, "Cache-Control", "no-store") : _);
|
|
@@ -50,7 +49,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
50
49
|
const settings = yield* $(tsplus_module_1.get(RequestSettings));
|
|
51
50
|
const eff =
|
|
52
51
|
// TODO: we don;t have access to user id here cause context is not yet created
|
|
53
|
-
tsplus_module_4.
|
|
52
|
+
tsplus_module_4.catchAllCause(tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Incoming request"), {
|
|
54
53
|
method: req.method,
|
|
55
54
|
path: req.originalUrl,
|
|
56
55
|
...settings.verbose
|
|
@@ -62,12 +61,13 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
62
61
|
reqHeaders: pretty(pars.headers)
|
|
63
62
|
}
|
|
64
63
|
: undefined
|
|
65
|
-
})
|
|
64
|
+
})
|
|
65
|
+
.andThen(tsplus_module_4.suspend(() => {
|
|
66
66
|
const handleRequest = tsplus_module_4.flatMap(tsplus_module_4.map(parseRequest(pars), ({ body, path, query }) => {
|
|
67
67
|
const hn = {
|
|
68
|
-
...
|
|
69
|
-
...
|
|
70
|
-
...
|
|
68
|
+
...body.value,
|
|
69
|
+
...query.value,
|
|
70
|
+
...path.value
|
|
71
71
|
};
|
|
72
72
|
return hn;
|
|
73
73
|
}), (parsedReq) => tsplus_module_4.map(tsplus_module_4.flatMap(tsplus_module_4.provideService(handle(parsedReq), handler.Request.Tag, parsedReq), encoder), (r) => tsplus_module_6.setStatus(r === undefined ? 204 : 200)(tsplus_module_6.setBody(res, tsplus_module_7.unsafeJson(r)))));
|
|
@@ -78,7 +78,8 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
78
78
|
// PR is not relevant here
|
|
79
79
|
: r;
|
|
80
80
|
return errorHandler(req, res, r2);
|
|
81
|
-
})), (cause) => tsplus_module_4.tapErrorCause(tsplus_module_4.
|
|
81
|
+
})), (cause) => tsplus_module_4.tapErrorCause(tsplus_module_4.sync(() => tsplus_module_6.setStatus(500)(res))
|
|
82
|
+
.tap((res) => tsplus_module_4.all([
|
|
82
83
|
reportError("request")(cause, {
|
|
83
84
|
path: req.originalUrl,
|
|
84
85
|
method: req.method
|
|
@@ -102,7 +103,8 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
102
103
|
}, {})))
|
|
103
104
|
});
|
|
104
105
|
})
|
|
105
|
-
], { concurrency: "inherit" })), (cause) => tsplus_module_4.sync(() => console.error("Error occurred while reporting error", cause))))
|
|
106
|
+
], { concurrency: "inherit" })), (cause) => tsplus_module_4.sync(() => console.error("Error occurred while reporting error", cause))))
|
|
107
|
+
.tap((res) => tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Finished request"), {
|
|
106
108
|
method: req.method,
|
|
107
109
|
path: req.originalUrl,
|
|
108
110
|
statusCode: res.status.toString(),
|
|
@@ -117,4 +119,4 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
117
119
|
name: tsplus_module_2.NonEmptyString255(handler.name)
|
|
118
120
|
}));
|
|
119
121
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZVJlcXVlc3RIYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vX3NyYy9hcGkvcm91dGluZy9tYWtlUmVxdWVzdEhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFHQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDL0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ3ZELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQU03RCxPQUFPLEVBQVksZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQXNCLE1BQU0sWUFBWSxDQUFBO0FBQzlGLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUdsRSxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsMkJBQW9CO0lBQ2pELE9BQU8sRUFBRSxLQUFLO0NBQ2YsQ0FBQyxDQUFBO0FBMENGLE1BQU0sVUFBVSxrQkFBa0IsQ0FrQmhDLE9BYUMsRUFDRCxZQUlnRCxFQUNoRCxlQUE0QztJQVk1QyxNQUFNLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFBO0lBRWhELE1BQU0sUUFBUSxHQUErQixRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLGlCQUFDLElBQUksQ0FBQTtJQUN2RSxNQUFNLElBQUksR0FBRyxRQUFnRSxDQUFBO0lBQzdFLHVGQUF1RjtJQUN2RixNQUFNLE9BQU8sR0FBRyxRQUFRLElBQUksSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNO1FBQzdDLENBQUMsd0JBQUMsSUFBSSxDQUFDLE1BQU07SUFDYixrQkFBa0I7SUFDbEIsc0VBQXNFO0lBQ3RFLDhEQUE4RDtJQUM5RCxJQUFJO0lBQ0osQ0FBQyx3QkFBQyxJQUFJLENBQU8sQ0FBQTtJQUNmLHVDQUF1QztJQUN2Qyxx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
|
package/dist/api/setupRequest.js
CHANGED
|
@@ -17,20 +17,23 @@ function makeInternalRequestContext(name) {
|
|
|
17
17
|
});
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
|
-
const withRequestSpan = (f) =>
|
|
21
|
-
.get
|
|
20
|
+
const withRequestSpan = (f) => RequestContextContainer
|
|
21
|
+
.get
|
|
22
|
+
.andThen((ctx) => tsplus_module_2.withLogSpan(tsplus_module_2.withSpan(f, "request", { attributes: tsplus_module_3.spanAttributes(ctx) })
|
|
22
23
|
// request context info is picked up directly in the logger for annotations.
|
|
23
24
|
, "request"));
|
|
24
|
-
const setupContextMap = tsplus_module_4.effectDiscard(
|
|
25
|
+
const setupContextMap = tsplus_module_4.effectDiscard(ContextMapContainer.andThen((_) => _.start));
|
|
25
26
|
// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
|
|
26
27
|
// RequestContext.Tag.makeLayer(requestContext)
|
|
27
28
|
// memoization problem
|
|
28
29
|
// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
|
|
29
30
|
const RequestContextStartLiveFromRequestContext = (requestContext) => tsplus_module_4.provideMerge(setupContextMap
|
|
30
31
|
// .provideMerge(RequestContextLiveFromRequestContext(requestContext))
|
|
31
|
-
, tsplus_module_4.effectDiscard(
|
|
32
|
+
, tsplus_module_4.effectDiscard(RequestContextContainer
|
|
33
|
+
.andThen((_) => _.start(requestContext))));
|
|
32
34
|
const RequestContextStartLive = (requestContext) => typeof requestContext === "string"
|
|
33
|
-
? tsplus_module_4.unwrapEffect(
|
|
35
|
+
? tsplus_module_4.unwrapEffect(makeInternalRequestContext(requestContext)
|
|
36
|
+
.andThen(RequestContextStartLiveFromRequestContext)) : RequestContextStartLiveFromRequestContext(requestContext);
|
|
34
37
|
/**
|
|
35
38
|
* @tsplus fluent effect/io/Effect setupRequestContext
|
|
36
39
|
*/
|
|
@@ -38,7 +41,7 @@ export function setupRequestContext(self, requestContext) {
|
|
|
38
41
|
return tsplus_module_2.provide(self
|
|
39
42
|
.pipe(withRequestSpan), RequestContextStartLive(requestContext));
|
|
40
43
|
}
|
|
41
|
-
const UpdateRequestContextLive = (f) => tsplus_module_4.effectDiscard(
|
|
44
|
+
const UpdateRequestContextLive = (f) => tsplus_module_4.effectDiscard(RequestContextContainer.andThen((rcc) => rcc.update(f)));
|
|
42
45
|
/**
|
|
43
46
|
* @tsplus fluent effect/io/Effect updateRequestContext
|
|
44
47
|
*/
|
|
@@ -47,4 +50,4 @@ export function updateRequestContext(self, f) {
|
|
|
47
50
|
// .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
|
|
48
51
|
, UpdateRequestContextLive(f));
|
|
49
52
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ3JELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBQ2hGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFBO0FBRTlFLFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxPQUFPLHFCQUFZLEdBQUcsRUFBRTtRQUN0QixNQUFNLEVBQUUsR0FBRyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDM0IsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixFQUFFO1lBQ0YsTUFBTSxFQUFFLEVBQUU7WUFDVixNQUFNLEVBQUUsSUFBSTtZQUNaLElBQUksRUFBRSxnQkFBQSxpQkFBaUIsQ0FBQyxJQUFJLENBQUM7U0FDOUIsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxlQUFlLEdBQUcsQ0FBVSxDQUFrQixFQUFFLEVBQUUsQ0FDdEQsdUJBQXVCO0tBQ3BCLEdBQUc7S0FDSCxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNmLDRCQUFBLHlCQUFBLENBQUMsRUFDVyxTQUFTLEVBQUUsRUFBRSxVQUFVLGlDQUFFLEdBQUcsQ0FBZSxFQUFFLENBQUM7QUFDeEQsNEVBQTRFO0VBQy9ELFNBQVMsQ0FBQyxDQUMxQixDQUFBO0FBRUwsTUFBTSxlQUFlLGlDQUFHLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFlLENBQUE7QUFFbEYsbUZBQW1GO0FBQ25GLGlEQUFpRDtBQUNqRCxzQkFBc0I7QUFDdEIscUZBQXFGO0FBQ3JGLE1BQU0seUNBQXlDLEdBQUcsQ0FBQyxjQUE4QixFQUFFLEVBQUUsQ0FDbkYsNkJBQUEsZUFBZTtBQUNiLHNFQUFzRTtnQ0FFcEUsdUJBQXVCO0tBQ3BCLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQyxFQUUzQyxDQUFBO0FBRUwsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLGNBQXVDLEVBQUUsRUFBRSxDQUMxRSxPQUFPLGNBQWMsS0FBSyxRQUFRO0lBQ2hDLENBQUMsOEJBQUMsMEJBQTBCLENBQUMsY0FBYyxDQUFDO1NBQ3pDLE9BQU8sQ0FBQyx5Q0FBeUMsQ0FBQyxFQUVyRCxDQUFDLENBQUMseUNBQXlDLENBQUMsY0FBYyxDQUFDLENBQUE7QUFFL0Q7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBQVUsSUFBcUIsRUFBRSxjQUF1QztJQUN6RyxPQUFPLHdCQUFBLElBQUk7U0FDUixJQUFJLENBQUMsZUFBZSxDQUFDLEVBQ2IsdUJBQXVCLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQTtBQUNyRCxDQUFDO0FBRUQsTUFBTSx3QkFBd0IsR0FBRyxDQUFDLENBQXlDLEVBQUUsRUFBRSwrQkFDN0UsdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQWUsQ0FBQTtBQUV4RTs7R0FFRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBVSxJQUFxQixFQUFFLENBQXlDO0lBQzVHLE9BQU8sd0JBQUEsSUFBSTtJQUNULHlFQUF5RTtNQUNoRSx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ3pDLENBQUMifQ==
|
package/dist/errorReporter.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "effect/Cause";
|
|
2
2
|
import * as tsplus_module_2 from "effect/Effect";
|
|
3
|
-
import * as tsplus_module_3 from "@effect-app/core/Option";
|
|
4
3
|
import { dropUndefined } from "@effect-app/core/utils";
|
|
5
4
|
import * as Sentry from "@sentry/node";
|
|
6
5
|
import { CauseException } from "./errors.js";
|
|
@@ -22,7 +21,7 @@ export function reportError(name) {
|
|
|
22
21
|
}
|
|
23
22
|
function reportSentry(cause, name, extras) {
|
|
24
23
|
return tsplus_module_2.map(RequestContextContainer.getOption, (ctx) => {
|
|
25
|
-
const context =
|
|
24
|
+
const context = ctx.value;
|
|
26
25
|
const scope = new Sentry.Scope();
|
|
27
26
|
if (context)
|
|
28
27
|
scope.setContext("context", context);
|
|
@@ -58,4 +57,4 @@ export function reportMessage(message) {
|
|
|
58
57
|
export function reportMessageM(message) {
|
|
59
58
|
return tsplus_module_2.sync(() => reportMessage(message));
|
|
60
59
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUN0RCxPQUFPLEtBQUssTUFBTSxNQUFNLGNBQWMsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzVDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFBO0FBRS9FLE1BQU0sVUFBVSxXQUFXLENBQ3pCLElBQVk7SUFFWixPQUFPLENBQUMsS0FBcUIsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDakUsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRSxDQUFDO1lBQzFCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyw2QkFBQSx5QkFBZ0IsYUFBYSxDQUFDLEVBQWMsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUM3RixPQUFNO1FBQ1IsQ0FBQztRQUNELEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sS0FBSyxHQUFHLElBQUksY0FBYyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUM3QyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sNkJBQUEseUJBQ1ksaUJBQWlCLEVBQUUsS0FBSyxDQUFDLEVBQ3JCLGFBQWEsQ0FBQztZQUMxQixNQUFNO1lBQ04sU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDekIsY0FBYyxFQUFFLElBQUk7U0FDckIsQ0FBQyxDQUFDLENBQ04sQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUVELFNBQVMsWUFBWSxDQUNuQixLQUFxQixFQUNyQixJQUFZLEVBQ1osTUFBMkM7SUFFM0MsT0FBTyxvQkFBQSx1QkFBdUIsQ0FBQyxTQUFTLEVBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNuRCxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBTSxDQUFBO1FBQzFCLE1BQU0sS0FBSyxHQUFHLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2hDLElBQUksT0FBTztZQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLE9BQTZDLENBQUMsQ0FBQTtRQUN2RixJQUFJLE1BQU07WUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUM5QyxNQUFNLEtBQUssR0FBRyxJQUFJLGNBQWMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDN0MsS0FBSyxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBUyxDQUFDLENBQUE7UUFDaEQsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUN2QyxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixJQUFZO0lBRVosT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0Qsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRSxDQUFDO1lBQzFCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyw2QkFBQSx5QkFBZ0IsYUFBYSxDQUFDLEVBQWMsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDaEYsT0FBTTtRQUNSLENBQUM7UUFDRCxNQUFNLEtBQUssR0FBRyxJQUFJLGNBQWMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDN0MsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLDZCQUFBLDJCQUNjLGVBQWUsRUFBRSxLQUFLLENBQUMsRUFDckIsYUFBYSxDQUFDO1lBQzFCLE1BQU07WUFDTixTQUFTLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBRTtZQUN6QixjQUFjLEVBQUUsSUFBSTtTQUNyQixDQUFDLENBQUMsQ0FDTixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLHFCQUFZLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO0FBQ2xELENBQUMifQ==
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "effect/FiberId";
|
|
2
|
-
import * as tsplus_module_2 from "
|
|
3
|
-
import * as tsplus_module_3 from "effect/
|
|
4
|
-
import * as tsplus_module_4 from "effect/
|
|
5
|
-
import * as tsplus_module_5 from "effect/
|
|
6
|
-
import * as tsplus_module_6 from "effect/Logger";
|
|
2
|
+
import * as tsplus_module_2 from "effect/Cause";
|
|
3
|
+
import * as tsplus_module_3 from "effect/List";
|
|
4
|
+
import * as tsplus_module_4 from "effect/HashMap";
|
|
5
|
+
import * as tsplus_module_5 from "effect/Logger";
|
|
7
6
|
import { getRequestContext } from "./shared.js";
|
|
8
|
-
export const jsonLogger =
|
|
7
|
+
export const jsonLogger = tsplus_module_5.make(({ annotations, cause, context, fiberId, logLevel, message, spans }) => {
|
|
9
8
|
const now = new Date();
|
|
10
9
|
const nowMillis = now.getTime();
|
|
11
10
|
const c = getRequestContext(context);
|
|
@@ -14,10 +13,10 @@ export const jsonLogger = tsplus_module_6.make(({ annotations, cause, context, f
|
|
|
14
13
|
level: logLevel.label,
|
|
15
14
|
fiber: tsplus_module_1.threadName(fiberId),
|
|
16
15
|
message,
|
|
17
|
-
request:
|
|
18
|
-
cause: cause != null && cause !=
|
|
19
|
-
spans:
|
|
20
|
-
annotations:
|
|
16
|
+
request: c.value,
|
|
17
|
+
cause: cause != null && cause != tsplus_module_2.empty ? tsplus_module_2.pretty(cause) : undefined,
|
|
18
|
+
spans: tsplus_module_3.toArray(tsplus_module_3.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime }))),
|
|
19
|
+
annotations: tsplus_module_4.size(annotations) > 0
|
|
21
20
|
? [...annotations].reduce((prev, [k, v]) => {
|
|
22
21
|
prev[k] = v;
|
|
23
22
|
return prev;
|
|
@@ -26,5 +25,5 @@ export const jsonLogger = tsplus_module_6.make(({ annotations, cause, context, f
|
|
|
26
25
|
};
|
|
27
26
|
globalThis.console.log(JSON.stringify(data));
|
|
28
27
|
});
|
|
29
|
-
export const logJson =
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
export const logJson = tsplus_module_5.replace(tsplus_module_5.defaultLogger, jsonLogger);
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvbG9nZ2VyL2pzb25Mb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLHFCQUN4QixDQUFDLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtJQUNyRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFBO0lBQ3RCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUUvQixNQUFNLENBQUMsR0FBRyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUVwQyxNQUFNLElBQUksR0FBRztRQUNYLFNBQVMsRUFBRSxHQUFHO1FBQ2QsS0FBSyxFQUFFLFFBQVEsQ0FBQyxLQUFLO1FBQ3JCLEtBQUssNkJBQUUsT0FBTyxDQUFXO1FBQ3pCLE9BQU87UUFDUCxPQUFPLEVBQUUsQ0FBQyxDQUFDLEtBQUs7UUFDaEIsS0FBSyxFQUFFLEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyx5QkFBZSxDQUFDLENBQUMsd0JBQUMsS0FBSyxFQUFRLENBQUMsQ0FBQyxTQUFTO1FBQ3ZFLEtBQUssMEJBQUUsb0JBQUEsS0FBSyxFQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFRO1FBQ3RGLFdBQVcsRUFBRSxxQkFBQSxXQUFXLElBQVEsQ0FBQztZQUMvQixDQUFDLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUN6QyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNYLE9BQU8sSUFBSSxDQUFBO1lBQ2IsQ0FBQyxFQUFFLEVBQTZCLENBQUM7WUFDakMsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFBO0lBRUQsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzlDLENBQUMsQ0FDRixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLHVEQUFxQyxVQUFVLENBQUMsQ0FBQSJ9
|
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "@effect-app/
|
|
2
|
-
import * as tsplus_module_2 from "
|
|
3
|
-
import * as tsplus_module_3 from "effect/
|
|
4
|
-
import * as tsplus_module_4 from "effect/Logger";
|
|
1
|
+
import * as tsplus_module_1 from "@effect-app/prelude/utils";
|
|
2
|
+
import * as tsplus_module_2 from "effect/HashMap";
|
|
3
|
+
import * as tsplus_module_3 from "effect/Logger";
|
|
5
4
|
import { getRequestContext } from "./shared.js";
|
|
6
|
-
export const logfmtLogger =
|
|
5
|
+
export const logfmtLogger = tsplus_module_3.make((_) => {
|
|
7
6
|
let { annotations } = _;
|
|
8
7
|
const c = getRequestContext(_.context);
|
|
9
|
-
const requestContext =
|
|
8
|
+
const requestContext = c.value;
|
|
10
9
|
if (requestContext && requestContext.name !== "_root_") {
|
|
11
|
-
annotations =
|
|
10
|
+
annotations = tsplus_module_2.make(...[
|
|
12
11
|
...annotations,
|
|
13
|
-
...
|
|
12
|
+
...tsplus_module_1.RecordEntries(tsplus_module_1.object$({
|
|
14
13
|
"request.root.id": requestContext.rootId,
|
|
15
14
|
"request.id": requestContext.id,
|
|
16
15
|
"request.name": requestContext.name,
|
|
@@ -20,8 +19,8 @@ export const logfmtLogger = tsplus_module_4.make((_) => {
|
|
|
20
19
|
}))
|
|
21
20
|
]);
|
|
22
21
|
}
|
|
23
|
-
const formatted =
|
|
22
|
+
const formatted = tsplus_module_3.logfmtLogger.log({ ..._, annotations });
|
|
24
23
|
globalThis.console.log(formatted);
|
|
25
24
|
});
|
|
26
|
-
export const logFmt =
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
export const logFmt = tsplus_module_3.replace(tsplus_module_3.defaultLogger, logfmtLogger);
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9sb2dnZXIvbG9nRm10TG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUUvQyxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcscUJBQzFCLENBQUMsQ0FBQyxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN0QyxNQUFNLGNBQWMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFBO0lBQzlCLElBQUksY0FBYyxJQUFJLGNBQWMsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsV0FBVyxHQUFHLHFCQUFhLEdBQUc7WUFDNUIsR0FBRyxXQUFXO1lBQ2QseURBQUc7Z0JBQ0QsaUJBQWlCLEVBQUUsY0FBYyxDQUFDLE1BQU07Z0JBQ3hDLFlBQVksRUFBRSxjQUFjLENBQUMsRUFBRTtnQkFDL0IsY0FBYyxFQUFFLGNBQWMsQ0FBQyxJQUFJO2dCQUNuQyxtQkFBbUIsRUFBRSxjQUFjLENBQUMsU0FBUztnQkFDN0MsZ0JBQWdCLEVBQUUsY0FBYyxDQUFDLE1BQU07Z0JBQ3ZDLEdBQUcsY0FBYyxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsa0JBQWtCLEVBQUUsY0FBYyxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRTthQUNqRyxFQUVTO1NBQ1gsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUNELE1BQU0sU0FBUyxHQUFHLDZCQUFvQixHQUFHLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFBO0lBQ2hFLFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0FBQ25DLENBQUMsQ0FDRixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLHVEQUFxQyxZQUFZLENBQUMsQ0FBQSJ9
|
package/dist/logger/shared.js
CHANGED
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "effect/FiberRef";
|
|
2
2
|
import * as tsplus_module_2 from "effect/Context";
|
|
3
3
|
import * as tsplus_module_3 from "effect/Runtime";
|
|
4
|
-
import * as tsplus_module_4 from "effect/Option";
|
|
5
4
|
import { RuntimeFlags } from "effect";
|
|
6
5
|
import * as FiberRefs from "effect/FiberRefs";
|
|
7
6
|
import { RequestContextContainer } from "../services/RequestContextContainer.js";
|
|
8
7
|
export function getRequestContext(fiberRefs) {
|
|
9
8
|
const context = FiberRefs.getOrDefault(fiberRefs, tsplus_module_1.currentContext);
|
|
10
9
|
const a = tsplus_module_2.getOption(context, RequestContextContainer);
|
|
11
|
-
const c =
|
|
10
|
+
const c = a.map((_) => {
|
|
12
11
|
// TODO: perhaps a litle expensive?
|
|
13
12
|
const rt = tsplus_module_3.make({ context, fiberRefs, runtimeFlags: RuntimeFlags.none });
|
|
14
13
|
return tsplus_module_3.runSync(rt)(_.requestContext);
|
|
15
14
|
});
|
|
16
15
|
return c;
|
|
17
16
|
}
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9sb2dnZXIvc2hhcmVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDckMsT0FBTyxLQUFLLFNBQVMsTUFBTSxrQkFBa0IsQ0FBQTtBQUM3QyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQTtBQUVoRixNQUFNLFVBQVUsaUJBQWlCLENBQUMsU0FBOEI7SUFDOUQsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLFlBQVksQ0FBQyxTQUFTLGlDQUEwQixDQUFBO0lBQzFFLE1BQU0sQ0FBQyxHQUFHLDBCQUFBLE9BQU8sRUFBVyx1QkFBdUIsQ0FBQyxDQUFBO0lBQ3BELE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNwQixtQ0FBbUM7UUFDbkMsTUFBTSxFQUFFLEdBQUcscUJBQWEsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQTtRQUNoRixPQUFPLHdCQUFBLEVBQUUsRUFBUyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDckMsQ0FBQyxDQUFDLENBQUE7SUFDRixPQUFPLENBQUMsQ0FBQTtBQUNWLENBQUMifQ==
|