@social-mail/social-mail-web-server 1.8.21 → 1.8.23
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/dist/reports/model/entities/Visitor.d.ts +1 -0
- package/dist/reports/model/entities/Visitor.d.ts.map +1 -1
- package/dist/reports/model/entities/Visitor.js +4 -0
- package/dist/reports/model/entities/Visitor.js.map +1 -1
- package/dist/reports/workflows/activities/AddActivityWorkflow.d.ts +1 -0
- package/dist/reports/workflows/activities/AddActivityWorkflow.d.ts.map +1 -1
- package/dist/reports/workflows/activities/AddActivityWorkflow.js +7 -0
- package/dist/reports/workflows/activities/AddActivityWorkflow.js.map +1 -1
- package/dist/reports/workflows/visitor-added/VisitorAddedWorkflow.d.ts +1 -0
- package/dist/reports/workflows/visitor-added/VisitorAddedWorkflow.d.ts.map +1 -1
- package/dist/reports/workflows/visitor-added/VisitorAddedWorkflow.js +2 -1
- package/dist/reports/workflows/visitor-added/VisitorAddedWorkflow.js.map +1 -1
- package/dist/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.d.ts +1 -1
- package/dist/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.d.ts.map +1 -1
- package/dist/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.js +6 -5
- package/dist/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.js.map +1 -1
- package/dist/server/workflows/search/IndexAppFilesWorkflow.d.ts +1 -1
- package/dist/server/workflows/search/IndexAppFilesWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/search/IndexAppFilesWorkflow.js +27 -7
- package/dist/server/workflows/search/IndexAppFilesWorkflow.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/reports/model/entities/Visitor.ts +3 -0
- package/src/reports/workflows/activities/AddActivityWorkflow.ts +10 -0
- package/src/reports/workflows/visitor-added/VisitorAddedWorkflow.ts +3 -2
- package/src/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.tsx +14 -11
- package/src/server/workflows/search/IndexAppFilesWorkflow.ts +28 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Visitor.d.ts","sourceRoot":"","sources":["../../../../src/reports/model/entities/Visitor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AAEpC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI3E,MAAM,CAAC,OAAO,OAAO,OAAO;IAGxB,SAAS,EAAE,MAAM,CAAC;IAOlB,MAAM,EAAE,MAAM,CAAC;IAGf,SAAS,EAAE,MAAM,CAAC;IAGlB,OAAO,EAAE,MAAM,CAAC;IAGhB,SAAS,EAAE,MAAM,CAAC;IAGlB,MAAM,EAAE,MAAM,CAAC;IAGf,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,GAAG,EAAE,MAAM,CAAC;IAGZ,GAAG,EAAE,MAAM,CAAC;IAGZ,UAAU,EAAE,MAAM,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,aAAa,EAAE,MAAM,CAAC;IAGtB,EAAE,EAAE,MAAM,CAAC;IAGX,SAAS,EAAE,MAAM,CAAC;IAGlB,WAAW,EAAE,QAAQ,CAAC;IAGtB,WAAW,EAAE,QAAQ,CAAC;IAGtB,WAAW,EAAE,MAAM,CAAC;IAGpB,eAAe,EAAE,MAAM,CAAC;IAGxB,YAAY,EAAE,MAAM,CAAC;IAGrB,WAAW,EAAE,MAAM,CAAC;IAEpB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,KAAK,EAAE,CAAC;CAEnB"}
|
|
1
|
+
{"version":3,"file":"Visitor.d.ts","sourceRoot":"","sources":["../../../../src/reports/model/entities/Visitor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AAEpC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI3E,MAAM,CAAC,OAAO,OAAO,OAAO;IAGxB,SAAS,EAAE,MAAM,CAAC;IAOlB,MAAM,EAAE,MAAM,CAAC;IAGf,SAAS,EAAE,MAAM,CAAC;IAGlB,OAAO,EAAE,MAAM,CAAC;IAGhB,SAAS,EAAE,MAAM,CAAC;IAGlB,MAAM,EAAE,MAAM,CAAC;IAGf,WAAW,EAAE,MAAM,CAAC;IAGpB,YAAY,EAAE,MAAM,CAAC;IAGrB,QAAQ,EAAE,MAAM,CAAC;IAGjB,GAAG,EAAE,MAAM,CAAC;IAGZ,GAAG,EAAE,MAAM,CAAC;IAGZ,UAAU,EAAE,MAAM,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,aAAa,EAAE,MAAM,CAAC;IAGtB,EAAE,EAAE,MAAM,CAAC;IAGX,SAAS,EAAE,MAAM,CAAC;IAGlB,WAAW,EAAE,QAAQ,CAAC;IAGtB,WAAW,EAAE,QAAQ,CAAC;IAGtB,WAAW,EAAE,MAAM,CAAC;IAGpB,eAAe,EAAE,MAAM,CAAC;IAGxB,YAAY,EAAE,MAAM,CAAC;IAGrB,WAAW,EAAE,MAAM,CAAC;IAEpB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,KAAK,EAAE,CAAC;CAEnB"}
|
|
@@ -51,6 +51,10 @@ __decorate([
|
|
|
51
51
|
Column({ dataType: "Char", length: 400, nullable: true }),
|
|
52
52
|
__metadata("design:type", String)
|
|
53
53
|
], Visitor.prototype, "deviceVendor", void 0);
|
|
54
|
+
__decorate([
|
|
55
|
+
Column({ dataType: "Char", length: 400, nullable: true }),
|
|
56
|
+
__metadata("design:type", String)
|
|
57
|
+
], Visitor.prototype, "referrer", void 0);
|
|
54
58
|
__decorate([
|
|
55
59
|
Column({ dataType: "Char", length: 400, nullable: true }),
|
|
56
60
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Visitor.js","sourceRoot":"","sources":["../../../../src/reports/model/entities/Visitor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,OAAO,GAAb,MAAM,OAAO;
|
|
1
|
+
{"version":3,"file":"Visitor.js","sourceRoot":"","sources":["../../../../src/reports/model/entities/Visitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddActivityWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/reports/workflows/activities/AddActivityWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAO7D,MAAM,WAAW,aAAa;IAC1B,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;CACV;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAQ,CAAC;IACtD,QAAQ,EAAE,aAAa,CAAC;IACxB,KAAK,MAAC;IACN,SAAS,MAAC;IACV,OAAO,MAAC;IACR,MAAM,MAAC;IACP,eAAe,MAAC;IAChB,IAAI,MAAA;CACP,CAAC;IAEQ,GAAG;IAKH,cAAc,CACR,EAAE,CAAC,EAAE,eAAe;
|
|
1
|
+
{"version":3,"file":"AddActivityWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/reports/workflows/activities/AddActivityWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAO7D,MAAM,WAAW,aAAa;IAC1B,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;IACP,CAAC,EAAE,GAAG,CAAC;CACV;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAQ,CAAC;IACtD,QAAQ,EAAE,aAAa,CAAC;IACxB,KAAK,MAAC;IACN,SAAS,MAAC;IACV,OAAO,MAAC;IACR,MAAM,MAAC;IACP,eAAe,MAAC;IAChB,IAAI,MAAA;CACP,CAAC;IAEQ,GAAG;IAKH,cAAc,CACR,EAAE,CAAC,EAAE,eAAe;CAyHnC"}
|
|
@@ -22,16 +22,19 @@ export default class AddActivityWorkflow extends Workflow {
|
|
|
22
22
|
}
|
|
23
23
|
async insertActivity(db) {
|
|
24
24
|
const { visitID, visitorID, siteID, event, time, timeZoneSeconds = 0, activity: { p: page, u: url, q: query, x, y, } } = this.input;
|
|
25
|
+
let { activity: { r: referrer } } = this.input;
|
|
25
26
|
await db.visitActivities.statements.insert({
|
|
26
27
|
visitID,
|
|
27
28
|
event,
|
|
28
29
|
page,
|
|
29
30
|
query,
|
|
31
|
+
referrer,
|
|
30
32
|
x,
|
|
31
33
|
y,
|
|
32
34
|
url
|
|
33
35
|
});
|
|
34
36
|
const visitor = await db.visitors.statements.select({}, { visitorID });
|
|
37
|
+
referrer = visitor.referrer;
|
|
35
38
|
await db.visitors.where(visitor, (p) => (v) => v.visitorID === p.visitorID)
|
|
36
39
|
.update(void 0, (p) => (v) => ({
|
|
37
40
|
firstVisitID: Sql.coll.min(v.visits.map((vv) => vv.visitID)),
|
|
@@ -101,6 +104,10 @@ export default class AddActivityWorkflow extends Workflow {
|
|
|
101
104
|
if (country) {
|
|
102
105
|
await insertReport(startHour, `/country/${country}`, { country });
|
|
103
106
|
}
|
|
107
|
+
if (referrer) {
|
|
108
|
+
referrer = referrer.replace(/^https?\:\/\//i, "");
|
|
109
|
+
await insertReport(startHour, `/source/${referrer}`, { referrer });
|
|
110
|
+
}
|
|
104
111
|
}
|
|
105
112
|
}
|
|
106
113
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddActivityWorkflow.js","sourceRoot":"","sources":["../../../../src/reports/workflows/activities/AddActivityWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAC7D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,qBAAqB,MAAM,yCAAyC,CAAC;AAG5E,OAAO,GAAG,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"AddActivityWorkflow.js","sourceRoot":"","sources":["../../../../src/reports/workflows/activities/AddActivityWorkflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import ReportDbContext from "../../model/ReportDbContext.js";
|
|
|
3
3
|
import GeoIPService from "../../../server/services/geo-ip/GeoIPService.js";
|
|
4
4
|
export default class VisitorAddedWorkflow extends Workflow<{
|
|
5
5
|
visitorID: any;
|
|
6
|
+
referrer: any;
|
|
6
7
|
}> {
|
|
7
8
|
run(): Promise<void>;
|
|
8
9
|
parseUserAgent(db?: ReportDbContext, geo?: GeoIPService): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VisitorAddedWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/reports/workflows/visitor-added/VisitorAddedWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAE7D,OAAO,YAAY,MAAM,iDAAiD,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,QAAQ,CAAC;IAAE,SAAS,MAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"VisitorAddedWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/reports/workflows/visitor-added/VisitorAddedWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAE7D,OAAO,YAAY,MAAM,iDAAiD,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,QAAQ,CAAC;IAAE,SAAS,MAAC;IAAC,QAAQ,MAAA;CAAE,CAAC;IAE/E,GAAG;IAKG,cAAc,CACR,EAAE,CAAC,EAAE,eAAe,EACpB,GAAG,CAAC,EAAE,YAAY;CAsCjC"}
|
|
@@ -20,7 +20,7 @@ export default class VisitorAddedWorkflow extends Workflow {
|
|
|
20
20
|
return this.parseUserAgent();
|
|
21
21
|
}
|
|
22
22
|
async parseUserAgent(db, geo) {
|
|
23
|
-
const { visitorID } = this.input;
|
|
23
|
+
const { visitorID, referrer } = this.input;
|
|
24
24
|
const v = await db.visitors.statements.select({}, { visitorID });
|
|
25
25
|
const c = await geo.getBlock(v.ipAddress ?? "0.0.0.0");
|
|
26
26
|
const r = myUaParser(v.userAgent ?? "");
|
|
@@ -37,6 +37,7 @@ export default class VisitorAddedWorkflow extends Workflow {
|
|
|
37
37
|
const engineVersion = r.engine?.version;
|
|
38
38
|
await db.visitors.statements.update({
|
|
39
39
|
country,
|
|
40
|
+
referrer,
|
|
40
41
|
app,
|
|
41
42
|
appVersion,
|
|
42
43
|
os,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VisitorAddedWorkflow.js","sourceRoot":"","sources":["../../../../src/reports/workflows/visitor-added/VisitorAddedWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAC7D,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,YAAY,MAAM,iDAAiD,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,
|
|
1
|
+
{"version":3,"file":"VisitorAddedWorkflow.js","sourceRoot":"","sources":["../../../../src/reports/workflows/visitor-added/VisitorAddedWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAC7D,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,YAAY,MAAM,iDAAiD,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,QAAiC;IAE/E,GAAG;QACC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IACjC,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACR,EAAoB,EACpB,GAAkB;QAE1B,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3C,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAEjE,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAExC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACtB,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC;QACtC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC;QACtB,MAAM,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC;QAChC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;QAC9B,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC;QACpC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC;QACtC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC;QAChC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;QAC9B,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC;QAExC,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;YAChC,OAAO;YACP,QAAQ;YACR,GAAG;YACH,UAAU;YACV,EAAE;YACF,SAAS;YACT,MAAM;YACN,WAAW;YACX,YAAY;YACZ,GAAG;YACH,MAAM;YACN,aAAa;SAChB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtB,CAAC;CAGJ;AAxCS;IADL,cAAc;IAEV,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;;qCADM,eAAe;QACd,YAAY;;0DAmC7B"}
|
|
@@ -10,6 +10,6 @@ export default class extends Page<IActivityInfo> {
|
|
|
10
10
|
rc: ReportingCache;
|
|
11
11
|
wc: ReportWorkflowContext;
|
|
12
12
|
run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
|
|
13
|
-
getVisitor(visitorID: any, siteID: any): Promise<Visitor>;
|
|
13
|
+
getVisitor(visitorID: any, siteID: any, referrer: any): Promise<Visitor>;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=get.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.tsx"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAC5E,OAAO,cAAc,MAAM,iDAAiD,CAAC;AAC7E,OAA4B,EAAE,aAAa,EAAE,MAAM,kEAAkE,CAAC;AACtH,OAAO,qBAAqB,MAAM,yDAAyD,CAAC;AAE5F,OAAO,OAAO,MAAM,gDAAgD,CAAC;AAKrE,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI,CAAC,aAAa,CAAC;IAG5C,KAAK,EAAE,MAAM,CAAC;IAGd,EAAE,EAAE,eAAe,CAAC;IAGpB,EAAE,EAAE,cAAc,CAAC;IAGnB,EAAE,EAAE,qBAAqB,CAAC;IAEpB,GAAG;
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.tsx"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAC5E,OAAO,cAAc,MAAM,iDAAiD,CAAC;AAC7E,OAA4B,EAAE,aAAa,EAAE,MAAM,kEAAkE,CAAC;AACtH,OAAO,qBAAqB,MAAM,yDAAyD,CAAC;AAE5F,OAAO,OAAO,MAAM,gDAAgD,CAAC;AAKrE,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI,CAAC,aAAa,CAAC;IAG5C,KAAK,EAAE,MAAM,CAAC;IAGd,EAAE,EAAE,eAAe,CAAC;IAGpB,EAAE,EAAE,cAAc,CAAC;IAGnB,EAAE,EAAE,qBAAqB,CAAC;IAEpB,GAAG;IAsEH,UAAU,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,KAAA,EAAE,QAAQ,KAAA;CA8BpD"}
|
|
@@ -23,7 +23,8 @@ export default class default_1 extends Page {
|
|
|
23
23
|
const { db, event } = this;
|
|
24
24
|
const { siteID, timeZoneSeconds } = await this.rc.generateSiteDb(this.request.hostName);
|
|
25
25
|
const time = DateTime.now;
|
|
26
|
-
const
|
|
26
|
+
const { p, u, x, y, r, q } = this.query;
|
|
27
|
+
const visitor = await this.getVisitor(this.request.cookies["vid"], siteID, r);
|
|
27
28
|
const visitorID = visitor.visitorID;
|
|
28
29
|
let visitID = this.request.cookies["vvid"];
|
|
29
30
|
if (visitID) {
|
|
@@ -49,7 +50,6 @@ export default class default_1 extends Page {
|
|
|
49
50
|
// reset visit max age...
|
|
50
51
|
this.response.cookie("vvid", visitID, { secure: true, httpOnly: true, maxAge: visitMaxAge });
|
|
51
52
|
}
|
|
52
|
-
const { p, u, x, y, q } = this.query;
|
|
53
53
|
await this.wc.queue(AddActivityWorkflow, {
|
|
54
54
|
siteID,
|
|
55
55
|
visitID,
|
|
@@ -62,12 +62,13 @@ export default class default_1 extends Page {
|
|
|
62
62
|
u,
|
|
63
63
|
x,
|
|
64
64
|
y,
|
|
65
|
-
q
|
|
65
|
+
q,
|
|
66
|
+
r
|
|
66
67
|
}
|
|
67
68
|
});
|
|
68
69
|
return this.json({});
|
|
69
70
|
}
|
|
70
|
-
async getVisitor(visitorID, siteID) {
|
|
71
|
+
async getVisitor(visitorID, siteID, referrer) {
|
|
71
72
|
const { db } = this;
|
|
72
73
|
let visitor = visitorID ? await this.rc.getVisitor(visitorID) : null;
|
|
73
74
|
if (visitor) {
|
|
@@ -84,7 +85,7 @@ export default class default_1 extends Page {
|
|
|
84
85
|
userAgent: this.request.headers["user-agent"]
|
|
85
86
|
});
|
|
86
87
|
visitorID = `${visitor.visitorID}`;
|
|
87
|
-
await this.wc.queue(VisitorAddedWorkflow, { visitorID });
|
|
88
|
+
await this.wc.queue(VisitorAddedWorkflow, { visitorID, referrer });
|
|
88
89
|
this.response.cookie("vid", visitorID, { secure: true, httpOnly: true, maxAge });
|
|
89
90
|
return visitor;
|
|
90
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../src/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAC5E,OAAO,cAAc,MAAM,iDAAiD,CAAC;AAC7E,OAAO,mBAAsC,MAAM,kEAAkE,CAAC;AACtH,OAAO,qBAAqB,MAAM,yDAAyD,CAAC;AAC5F,OAAO,oBAAoB,MAAM,sEAAsE,CAAC;AAGxG,MAAM,MAAM,GAAG,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,EAAE,CAAC;AAC3B,MAAM,WAAW,GAAG,CAAC,GAAC,EAAE,GAAC,EAAE,CAAC;AAE5B,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAmB;IAc5C,KAAK,CAAC,GAAG;QAEL,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAE3B,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAExF,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC;QAE1B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../src/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export default class IndexAppFilesWorkflow extends Workflow {
|
|
|
6
6
|
static taskGroup: string;
|
|
7
7
|
static startIndexing(context: AppWorkflowContext): Promise<string>;
|
|
8
8
|
run(): Promise<void>;
|
|
9
|
-
index(db?: SocialMailContext, tempFileService?: TempFileService): Promise<
|
|
9
|
+
index(start: any, db?: SocialMailContext, tempFileService?: TempFileService): Promise<any>;
|
|
10
10
|
private extractText;
|
|
11
11
|
private saveTextContent;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexAppFilesWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/search/IndexAppFilesWorkflow.ts"],"names":[],"mappings":"AAAA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AAEnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAS/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,QAAQ;IAEvD,MAAM,CAAC,SAAS,SAAW;IAE3B,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB;IAM1C,GAAG;
|
|
1
|
+
{"version":3,"file":"IndexAppFilesWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/search/IndexAppFilesWorkflow.ts"],"names":[],"mappings":"AAAA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AAEnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAS/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,QAAQ;IAEvD,MAAM,CAAC,SAAS,SAAW;IAE3B,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB;IAM1C,GAAG;IAWH,KAAK,CACP,KAAK,KAAA,EACG,EAAE,CAAC,EAAE,iBAAiB,EACtB,eAAe,CAAC,EAAE,eAAe;YAmC/B,WAAW;YA6BX,eAAe;CAiDhC"}
|
|
@@ -25,20 +25,40 @@ class IndexAppFilesWorkflow extends Workflow {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
async run() {
|
|
28
|
-
|
|
28
|
+
let start = -1;
|
|
29
|
+
for (;;) {
|
|
30
|
+
start = await this.index(start);
|
|
31
|
+
if (!BigInt(start)) {
|
|
32
|
+
break;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
29
35
|
}
|
|
30
|
-
async index(db, tempFileService) {
|
|
36
|
+
async index(start, db, tempFileService) {
|
|
31
37
|
db.verifyFilters = false;
|
|
32
38
|
db.raiseEvents = false;
|
|
33
|
-
|
|
34
|
-
.where(void 0, (p) => (x) => x.fileContentID !== null && x.fileContent.textDocumentID === null)
|
|
39
|
+
let q = db.appFiles
|
|
40
|
+
.where(void 0, (p) => (x) => x.fileContentID !== null && x.fileContent.textDocumentID === null);
|
|
41
|
+
if (BigInt(start) > 0) {
|
|
42
|
+
q = q.where({ start }, (p) => (x) => x.appFileID < p.start);
|
|
43
|
+
}
|
|
44
|
+
const files = await q
|
|
35
45
|
.orderByDescending(void 0, (p) => (x) => x.appFileID)
|
|
36
46
|
.limit(100)
|
|
37
47
|
.include((x) => x.fileContent)
|
|
38
48
|
.toArray();
|
|
49
|
+
if (!files.length) {
|
|
50
|
+
return 0;
|
|
51
|
+
}
|
|
39
52
|
for (const iterator of files) {
|
|
40
|
-
|
|
53
|
+
start = iterator.appFileID;
|
|
54
|
+
try {
|
|
55
|
+
await this.saveTextContent(iterator, tempFileService, db);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
console.error(error);
|
|
59
|
+
}
|
|
41
60
|
}
|
|
61
|
+
return start;
|
|
42
62
|
}
|
|
43
63
|
async extractText(file, tempFileService, db) {
|
|
44
64
|
const isEmail = file.contentType === "message/rfc822";
|
|
@@ -111,10 +131,10 @@ IndexAppFilesWorkflow.taskGroup = "batch";
|
|
|
111
131
|
export default IndexAppFilesWorkflow;
|
|
112
132
|
__decorate([
|
|
113
133
|
UniqueActivity,
|
|
114
|
-
__param(0, Inject),
|
|
115
134
|
__param(1, Inject),
|
|
135
|
+
__param(2, Inject),
|
|
116
136
|
__metadata("design:type", Function),
|
|
117
|
-
__metadata("design:paramtypes", [SocialMailContext,
|
|
137
|
+
__metadata("design:paramtypes", [Object, SocialMailContext,
|
|
118
138
|
TempFileService]),
|
|
119
139
|
__metadata("design:returntype", Promise)
|
|
120
140
|
], IndexAppFilesWorkflow.prototype, "index", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexAppFilesWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/search/IndexAppFilesWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAG/D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAG5D,MAAqB,qBAAsB,SAAQ,QAAQ;IAIvD,MAAM,CAAC,aAAa,CAAC,OAA2B;QAC5C,OAAO,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC,EAAE;YAC3C,EAAE,EAAE,iBAAiB;SACxB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,GAAG;QACL,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"IndexAppFilesWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/search/IndexAppFilesWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAG/D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAG5D,MAAqB,qBAAsB,SAAQ,QAAQ;IAIvD,MAAM,CAAC,aAAa,CAAC,OAA2B;QAC5C,OAAO,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC,EAAE;YAC3C,EAAE,EAAE,iBAAiB;SACxB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,GAAG;QACL,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;QACf,SAAQ,CAAC;YACL,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjB,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CACP,KAAK,EACG,EAAsB,EACtB,eAAiC;QAGzC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QACzB,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;QAEvB,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ;aACd,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC;QAEpG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,CAAC;aAChB,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aACpD,KAAK,CAAC,GAAG,CAAC;aACV,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aAC7B,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,CAAC,CAAC;QACb,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC3B,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC;YAC3B,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,IAAe,EAAE,eAAgC,EAAE,EAAqB;QAE9F,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,KAAK,gBAAgB,CAAC;QACtD,IAAG,OAAO,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAChC,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC;gBACvD,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC9F,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACpC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;gBAC1D,IAAI,CAAC,EAAE,CAAC;oBACJ,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;QAAC,IAAI,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAGO,KAAK,CAAC,eAAe,CAAC,OAAgB,EAAE,eAAgC,EAAE,EAAqB;QACnG,IAAI,UAAU,GAAG,EAAE,CAAC;QAEpB,4DAA4D;QAE5D,iBAAiB;QACjB,6CAA6C;QAC7C,4DAA4D;QAC5D,sGAAsG;QACtG,4CAA4C;QAC5C,uBAAuB;QACvB,sBAAsB;QACtB,4CAA4C;QAC5C,sCAAsC;QACtC,+DAA+D;QAC/D,iDAAiD;QACjD,4FAA4F;QAC5F,8BAA8B;QAC9B,uCAAuC;QACvC,uBAAuB;QACvB,mBAAmB;QACnB,eAAe;QACf,2CAA2C;QAC3C,WAAW;QACX,IAAI;QAEJ,MAAM,OAAO,GAAyB;YAClC,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,OAAO,CAAC,aAAa;SACvC,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAE5D,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC;gBAChD,cAAc,EAAE,OAAO,CAAC,aAAa;gBACrC,UAAU;aACb,CAAC,CAAC;YACH,OAAO,CAAC,cAAc,GAAG,EAAE,CAAC,cAAc,CAAC;QAC/C,CAAC;QACD,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CACnC,OAAO,CACV,CAAC;QAEF,OAAO,UAAU,CAAC;IACtB,CAAC;;AAtIM,+BAAS,GAAG,OAAO,CAAC;eAFV,qBAAqB;AAqBhC;IADL,cAAc;IAGV,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;;6CADM,iBAAiB;QACJ,eAAe;;kDAiC5C"}
|