@social-mail/social-mail-web-server 1.4.845 → 1.4.847
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/Tracer.d.ts.map +1 -1
- package/dist/Tracer.js +2 -1
- package/dist/Tracer.js.map +1 -1
- package/dist/WebCluster.d.ts.map +1 -1
- package/dist/WebCluster.js +1 -2
- package/dist/WebCluster.js.map +1 -1
- package/dist/WebServer.js +7 -7
- package/dist/WebServer.js.map +1 -1
- package/dist/common/globalEnv.d.ts +37 -0
- package/dist/common/globalEnv.d.ts.map +1 -1
- package/dist/common/globalEnv.js +50 -13
- package/dist/common/globalEnv.js.map +1 -1
- package/dist/globalServices.d.ts.map +1 -1
- package/dist/globalServices.js +2 -1
- package/dist/globalServices.js.map +1 -1
- package/dist/server/seed/user/seed-admin-user.d.ts.map +1 -1
- package/dist/server/seed/user/seed-admin-user.js +2 -1
- package/dist/server/seed/user/seed-admin-user.js.map +1 -1
- package/dist/server/services/cache/DiskCacheService.js +2 -3
- package/dist/server/services/cache/DiskCacheService.js.map +1 -1
- package/dist/server/services/push/PushService.d.ts.map +1 -1
- package/dist/server/services/push/PushService.js +2 -1
- package/dist/server/services/push/PushService.js.map +1 -1
- package/dist/server/services/push/forward/ForwardPushService.d.ts.map +1 -1
- package/dist/server/services/push/forward/ForwardPushService.js +2 -1
- package/dist/server/services/push/forward/ForwardPushService.js.map +1 -1
- package/dist/server/services/ui/renderUIClient.d.ts.map +1 -1
- package/dist/server/services/ui/renderUIClient.js +1 -2
- package/dist/server/services/ui/renderUIClient.js.map +1 -1
- package/dist/server/storage/LockFile.d.ts.map +1 -1
- package/dist/server/storage/LockFile.js +3 -2
- package/dist/server/storage/LockFile.js.map +1 -1
- package/dist/server/storage/StorageInstaller.d.ts.map +1 -1
- package/dist/server/storage/StorageInstaller.js +3 -2
- package/dist/server/storage/StorageInstaller.js.map +1 -1
- package/dist/server/storage/TempFileService.d.ts.map +1 -1
- package/dist/server/storage/TempFileService.js +2 -2
- package/dist/server/storage/TempFileService.js.map +1 -1
- package/dist/server/storage/azure/AzureStorage.d.ts.map +1 -1
- package/dist/server/storage/azure/AzureStorage.js +3 -2
- package/dist/server/storage/azure/AzureStorage.js.map +1 -1
- package/dist/server/storage/s3/S3Storage.d.ts.map +1 -1
- package/dist/server/storage/s3/S3Storage.js +3 -5
- package/dist/server/storage/s3/S3Storage.js.map +1 -1
- package/dist/server/storage/volume/av/AVService.d.ts.map +1 -1
- package/dist/server/storage/volume/av/AVService.js +6 -5
- package/dist/server/storage/volume/av/AVService.js.map +1 -1
- package/dist/tests/createTest.d.ts.map +1 -1
- package/dist/tests/createTest.js +0 -1
- package/dist/tests/createTest.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/callback/smtp/rcpt/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/callback/smtp/rcpt/index.js +2 -1
- package/dist/wwwroot/routes/callback/smtp/rcpt/index.js.map +1 -1
- package/package.json +2 -2
- package/src/Tracer.ts +2 -1
- package/src/WebCluster.ts +1 -2
- package/src/WebServer.ts +7 -7
- package/src/common/globalEnv.ts +50 -13
- package/src/globalServices.ts +2 -1
- package/src/server/seed/user/seed-admin-user.ts +2 -1
- package/src/server/services/cache/DiskCacheService.ts +2 -2
- package/src/server/services/push/PushService.ts +2 -1
- package/src/server/services/push/forward/ForwardPushService.ts +2 -1
- package/src/server/services/ui/renderUIClient.tsx +1 -2
- package/src/server/storage/LockFile.ts +4 -5
- package/src/server/storage/StorageInstaller.ts +3 -2
- package/src/server/storage/TempFileService.ts +2 -1
- package/src/server/storage/azure/AzureStorage.ts +3 -2
- package/src/server/storage/s3/S3Storage.ts +3 -5
- package/src/server/storage/volume/av/AVService.ts +6 -5
- package/src/tests/createTest.ts +0 -2
- package/src/wwwroot/routes/callback/smtp/rcpt/index.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TempFileService.js","sourceRoot":"","sources":["../../../src/server/storage/TempFileService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAc,QAAQ,IAAI,GAAG,EAA0B,MAAM,IAAI,CAAC;AACzE,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"TempFileService.js","sourceRoot":"","sources":["../../../src/server/storage/TempFileService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"AzureStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAQ/E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAGjD,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC;;IAQxB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAY7C,UAAU,CAAC,SAAS,EAAE,MAAM;IAI5B,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;KAAE,CAAC;CAOzF"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import BaseStorage from "../BaseStorage.js";
|
|
2
2
|
import * as BS from "@azure/storage-blob";
|
|
3
|
+
import { globalEnv } from "../../../common/globalEnv.js";
|
|
3
4
|
const { BlobServiceClient } = BS;
|
|
4
|
-
const cs =
|
|
5
|
-
const container =
|
|
5
|
+
const cs = globalEnv.azureStorage.connectionString;
|
|
6
|
+
const container = globalEnv.azureStorage.container;
|
|
6
7
|
export default class AzureStorage extends BaseStorage {
|
|
7
8
|
constructor() {
|
|
8
9
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"AzureStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC;AAEjC,MAAM,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC;AACnD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAKjD;QACI,KAAK,EAAE,CAAC;QACR,MAAM,MAAM,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,IAAe;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE;YAC1C,eAAe,EAAE;gBACb,cAAc;aACjB;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,0BAA0B,CAAC;QACrE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;IAC9D,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Storage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"S3Storage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAE9C,OAAO,CAAC,MAAM,CAAW;;IAkBnB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAWzE,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBzD,UAAU,CAAC,GAAG,EAAE,MAAM;CAO/B"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import BaseStorage from "../BaseStorage.js";
|
|
2
2
|
import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
|
|
3
|
-
|
|
3
|
+
import { globalEnv } from "../../../common/globalEnv.js";
|
|
4
|
+
const Bucket = globalEnv.s3.bucket ?? "test-bucket";
|
|
4
5
|
export default class S3Storage extends BaseStorage {
|
|
5
6
|
constructor() {
|
|
6
7
|
super();
|
|
7
|
-
const endpoint =
|
|
8
|
-
const region = process.env["SOCIAL_MAIL_S3_REGION"] ?? "us-east-1";
|
|
9
|
-
const accessKeyId = process.env["SOCIAL_MAIL_S3_ACCESS_KEY"] ?? "S3RVER";
|
|
10
|
-
const secretAccessKey = process.env["SOCIAL_MAIL_S3_SECRET"] ?? "S3RVER";
|
|
8
|
+
const { endpoint, accessKeyId, secretAccessKey, region } = globalEnv.s3;
|
|
11
9
|
this.client = new S3Client({
|
|
12
10
|
endpoint,
|
|
13
11
|
credentials: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Storage.js","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"S3Storage.js","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvG,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,MAAM,IAAI,aAAa,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAI9C;QACI,KAAK,EAAE,CAAC;QAER,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;QAExE,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC;YACvB,QAAQ;YACR,WAAW,EAAE;gBACT,WAAW;gBACX,eAAe;aAClB;YACD,cAAc,EAAE,IAAI;YACpB,MAAM;SACT,CAAC,CAAC;IAEP,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,GAAW;QACxB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC;YAClD,MAAM;YACN,GAAG;SACN,CAAC,CAAC,CAAC;QACJ,OAAO;YACH,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,MAAM,EAAE,CAAC,CAAC,IAAc;SAC3B,CAAE;IACP,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,IAAe;QAEzC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEvE,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEnC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC;YAClD,MAAM;YACN,GAAG;YACH,cAAc;YACd,UAAU;YACV,IAAI;SACP,CAAC,CAAC,CAAC;QACJ,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QACxB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC;YAC3C,MAAM;YACN,GAAG;SACN,CAAC,CAAC,CAAC;IACR,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AVService.d.ts","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAM1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"AVService.d.ts","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAM1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAuD/E,MAAM,CAAC,OAAO,OAAO,SAAS;IAE1B,MAAM,CAAC,OAAO;WAQD,IAAI,CAAC,IAAI,EAAE,SAAS;CAmBpC"}
|
|
@@ -49,11 +49,12 @@ import FileInfectedError from "../../FileInfectedError.js";
|
|
|
49
49
|
import sleep from "../../../../common/sleep.js";
|
|
50
50
|
import SocketClient from "../../../../protocols/socket/client/SocketClient.js";
|
|
51
51
|
import LockFile from "../../LockFile.js";
|
|
52
|
-
|
|
53
|
-
const
|
|
52
|
+
import { globalEnv } from "../../../../common/globalEnv.js";
|
|
53
|
+
const debugMode = (globalEnv.av.debug ?? "false") === "true";
|
|
54
|
+
const socket = (/^(false|none|0)$/i.test(globalEnv.av.port ?? "-1"))
|
|
54
55
|
? ""
|
|
55
|
-
: (
|
|
56
|
-
const host = socket ?
|
|
56
|
+
: (globalEnv.av.port || "/run/clamav/clamd.sock");
|
|
57
|
+
const host = socket ? globalEnv.av.host : void 0;
|
|
57
58
|
let scanner;
|
|
58
59
|
const loadScanner = async () => {
|
|
59
60
|
const now = Date.now();
|
|
@@ -114,7 +115,7 @@ export default class AVService {
|
|
|
114
115
|
const s = await this.scanner();
|
|
115
116
|
if (!s) {
|
|
116
117
|
if (socket) {
|
|
117
|
-
console.warn(`AV not enabled ${socket} ${
|
|
118
|
+
console.warn(`AV not enabled ${socket} ${globalEnv.av.port}`);
|
|
118
119
|
}
|
|
119
120
|
return;
|
|
120
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AVService.js","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAO,iBAAiB,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,MAAM,6BAA6B,CAAC;AAChD,OAAO,YAAY,MAAM,qDAAqD,CAAC;AAC/E,OAAO,QAAQ,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"AVService.js","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTest.d.ts","sourceRoot":"","sources":["../../src/tests/createTest.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,OAAO,EAAkB,IAAI,EAAE,MAAM,kCAAkC,CAAC;AASxE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7E,OAAO,EAAE,QAAQ,EAAE,MAAM,0DAA0D,CAAC;AAMpF,MAAM,CAAC,OAAO,WAAU,IAAI,EAAE,UAAU,QAEvC;
|
|
1
|
+
{"version":3,"file":"createTest.d.ts","sourceRoot":"","sources":["../../src/tests/createTest.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,OAAO,EAAkB,IAAI,EAAE,MAAM,kCAAkC,CAAC;AASxE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7E,OAAO,EAAE,QAAQ,EAAE,MAAM,0DAA0D,CAAC;AAMpF,MAAM,CAAC,OAAO,WAAU,IAAI,EAAE,UAAU,QAEvC;AAmCD,qBAAa,SAAS;WAGL,eAAe;WAQf,YAAY,CAAC,CAAC,EAAE,CAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,KAAM,OAAO,CAAC,IAAI,CAAC;IA8B5G,MAAM,CAAC,mBAAmB,CAAC,MAAM,GAAE,MAAU,EAAE,IAAI,GAAE,MAAgB,EAAE,GAAI,KAAK,EAAE,MAAM,EAAE;WAe7E,gBAAgB;WAKhB,cAAc;WA+Cd,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,KAAM,OAAO,CAAC,GAAG,CAAC;WAMxE,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,UAAQ;WAiClD,wBAAwB,CAAC,IAAI,EAAE,MAAM;;;;WA2CrC,mBAAmB,CAAC,GAAG,GAAE,MAAU,EAAE,YAAY,SAAM,EAAE,UAAU,WAAiC;WAYpG,gBAAgB,CAAC,IAAI,EAAE,IAAI,EACpC,EAAE,QAAQ,EAAE,UAAoB,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAChG,QAAQ,MAAC;QACT,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,EAAE,EAAE,MAAM,EAAE,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;QACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAA;KACrB;CAoER"}
|
package/dist/tests/createTest.js
CHANGED
|
@@ -68,7 +68,6 @@ export default function () {
|
|
|
68
68
|
}
|
|
69
69
|
// const localServiceScope = new ServiceProvider();
|
|
70
70
|
// localServiceScope.add(Logger, new ConsoleLogger());
|
|
71
|
-
// export const isTestMode = process.env.SOCIAL_MAIL_TEST ? true : false;
|
|
72
71
|
globalServices.add(GlobalEvents, new TestGlobalEvents());
|
|
73
72
|
// const globalServices = localServiceScope;
|
|
74
73
|
let testServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTest.js","sourceRoot":"","sources":["../../src/tests/createTest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAErE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,aAAa,MAAM,2CAA2C,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAQ,MAAM,kCAAkC,CAAC;AACxE,OAAO,mBAAmB,MAAM,2CAA2C,CAAC;AAC5E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,YAAY,EAAE,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAE9F,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;AAE5B,MAAM,CAAC,OAAO;IACV,yBAAyB;AAC7B,CAAC;AAED,mDAAmD;AACnD,sDAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"createTest.js","sourceRoot":"","sources":["../../src/tests/createTest.ts"],"names":[],"mappings":"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"}
|