@social-mail/social-mail-web-server 2.0.39 → 2.0.41
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/.tsbuildinfo +1 -1
- package/dist/server/virtual-servers/ClusterWebWorker.d.ts +1 -0
- package/dist/server/virtual-servers/ClusterWebWorker.d.ts.map +1 -1
- package/dist/server/virtual-servers/ClusterWebWorker.js +44 -9
- package/dist/server/virtual-servers/ClusterWebWorker.js.map +1 -1
- package/dist/server/workflows/site/CreateSocialSiteWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/site/CreateSocialSiteWorkflow.js +1 -0
- package/dist/server/workflows/site/CreateSocialSiteWorkflow.js.map +1 -1
- package/package.json +1 -1
- package/src/server/virtual-servers/ClusterWebWorker.ts +45 -9
- package/src/server/workflows/site/CreateSocialSiteWorkflow.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterWebWorker.d.ts","sourceRoot":"","sources":["../../../src/server/virtual-servers/ClusterWebWorker.ts"],"names":[],"mappings":"AAMA,OAAO,aAAa,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterWebWorker.d.ts","sourceRoot":"","sources":["../../../src/server/virtual-servers/ClusterWebWorker.ts"],"names":[],"mappings":"AAMA,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAiC/D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAkD7B,OAAO,CAAC,QAAQ,CAAC,IAAI;aACL,MAAM,EAAE;QAAE,MAAM,EAAE,aAAa,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;aAC/C,MAAM;aACN,UAAU;IAnD9B,OAAc,KAAK,SAElB;IAED,OAAoB,SAAS,CAAC,QAAQ,EAAE,MAAM,6BAkC7C;IAED,OAAO,CAAC,MAAM,CAAC,aAAa,CAAuD;IACnF,OAAO,CAAC,MAAM,CAAC,cAAc,CAAwD;IAErF,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,UAAU,CAAM;IACxB,OAAO,CAAC,WAAW,CAAgB;IAEnC,YACqB,IAAI,EAAE,MAAM,EACb,MAAM,EAAE;QAAE,MAAM,EAAE,aAAa,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAC/C,MAAM,KAAA,EACN,UAAU,KAAA,EAC7B;IAED,OAAO,aAYL;IAEK,KAAK,oFAoBV;IAGF,OAAO,CAAC,KAAK;IAoHP,UAAU,kBAoCf;CAEJ"}
|
|
@@ -8,6 +8,7 @@ import { globalServices } from "../../globalServices.js";
|
|
|
8
8
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
9
9
|
import VirtualHost from "./VirtualHost.js";
|
|
10
10
|
import { fileURLToPath } from "node:url";
|
|
11
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
11
12
|
// import { Worker } from "node:worker_threads";
|
|
12
13
|
const mainScript = fileURLToPath(import.meta.resolve("./VirtualServerMain.js"));
|
|
13
14
|
const tempPath = process.env.SOCIAL_MAIL_TMP_PATH || tmpdir();
|
|
@@ -72,16 +73,13 @@ class ClusterWebWorker {
|
|
|
72
73
|
if (!this.initialized) {
|
|
73
74
|
return;
|
|
74
75
|
}
|
|
75
|
-
try {
|
|
76
|
-
unlink(this.socket).catch(() => void 0);
|
|
77
|
-
}
|
|
78
|
-
catch {
|
|
79
|
-
// do nothing...
|
|
80
|
-
}
|
|
81
76
|
this.initialized = null;
|
|
82
|
-
console.log(
|
|
83
|
-
|
|
84
|
-
|
|
77
|
+
console.log(JSON.stringify({
|
|
78
|
+
serverID: this.server.server?.serverID,
|
|
79
|
+
pid: this.worker.pid,
|
|
80
|
+
action: "inactive worker disposed"
|
|
81
|
+
}));
|
|
82
|
+
this.killWorker().catch(ServerLogger.error);
|
|
85
83
|
};
|
|
86
84
|
this.fetch = (url, { method = "GET", body, headers } = {}) => {
|
|
87
85
|
const a = {};
|
|
@@ -201,6 +199,43 @@ class ClusterWebWorker {
|
|
|
201
199
|
});
|
|
202
200
|
})();
|
|
203
201
|
}
|
|
202
|
+
async killWorker() {
|
|
203
|
+
try {
|
|
204
|
+
try {
|
|
205
|
+
await unlink(this.socket);
|
|
206
|
+
// @ts-expect-error readonly
|
|
207
|
+
delete this.socket;
|
|
208
|
+
}
|
|
209
|
+
catch {
|
|
210
|
+
}
|
|
211
|
+
try {
|
|
212
|
+
await unlink(this.smtpSocket);
|
|
213
|
+
// @ts-expect-error readonly
|
|
214
|
+
delete this.smtpSocket;
|
|
215
|
+
}
|
|
216
|
+
catch {
|
|
217
|
+
}
|
|
218
|
+
const worker = this.worker;
|
|
219
|
+
await new Promise((resolve) => {
|
|
220
|
+
const timeout = setTimeout(() => {
|
|
221
|
+
worker.kill("SIGKILL");
|
|
222
|
+
}, 1000);
|
|
223
|
+
worker.on("exit", () => {
|
|
224
|
+
clearTimeout(timeout);
|
|
225
|
+
resolve();
|
|
226
|
+
});
|
|
227
|
+
worker.kill();
|
|
228
|
+
});
|
|
229
|
+
if (this.socket) {
|
|
230
|
+
await unlink(this.socket);
|
|
231
|
+
}
|
|
232
|
+
if (this.smtpSocket) {
|
|
233
|
+
await unlink(this.smtpSocket);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
catch {
|
|
237
|
+
}
|
|
238
|
+
}
|
|
204
239
|
}
|
|
205
240
|
ClusterWebWorker.socketWorkers = new TimedCache(5 * 60 * 1000);
|
|
206
241
|
ClusterWebWorker.virtualWorkers = new TimedCache(15 * 60 * 1000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterWebWorker.js","sourceRoot":"","sources":["../../../src/server/virtual-servers/ClusterWebWorker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ClusterWebWorker.js","sourceRoot":"","sources":["../../../src/server/virtual-servers/ClusterWebWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateSocialSiteWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/site/CreateSocialSiteWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAIjE,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,QAAQ,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;IAI7H,GAAG,kBAKR;IAwCK,UAAU,CACJ,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"CreateSocialSiteWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/site/CreateSocialSiteWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAIjE,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,QAAQ,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;IAI7H,GAAG,kBAKR;IAwCK,UAAU,CACJ,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,mBAAmB,iBA2FpC;CAEJ"}
|
|
@@ -151,6 +151,7 @@ export default class CreateSocialSiteWorkflow extends Workflow {
|
|
|
151
151
|
hosts.push(db.websiteFolderHosts.add({
|
|
152
152
|
host: "www." + domainName
|
|
153
153
|
}));
|
|
154
|
+
await db.saveChanges();
|
|
154
155
|
}
|
|
155
156
|
const tx = __addDisposableResource(env_1, await db.connection.createTransaction(), true);
|
|
156
157
|
if (globalEnv.wildcardDomain) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateSocialSiteWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/site/CreateSocialSiteWorkflow.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CreateSocialSiteWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/site/CreateSocialSiteWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,QAAiF;IAEnI,kEAAkE;IAElE,KAAK,CAAC,GAAG;QACL,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,+BAA+B;QAC/B,uCAAuC;QACvC,IAAI;IACR,CAAC;IAED,kBAAkB;IAClB,4BAA4B;IAC5B,sCAAsC;IACtC,qCAAqC;IACrC,MAAM;IACN,gCAAgC;IAChC,+CAA+C;IAC/C,iEAAiE;IAEjE,0DAA0D;IAC1D,2EAA2E;IAE3E,mEAAmE;IAEnE,gCAAgC;IAEhC,sBAAsB;IACtB,4BAA4B;IAC5B,oCAAoC;IACpC,mDAAmD;IACnD,wBAAwB;IACxB,uCAAuC;IACvC,6CAA6C;IAC7C,6BAA6B;IAC7B,iBAAiB;IACjB,aAAa;IACb,oBAAoB;IACpB,6BAA6B;IAC7B,4BAA4B;IAC5B,yBAAyB;IACzB,2BAA2B;IAC3B,8BAA8B;IAC9B,UAAU;IAEV,8BAA8B;IAC9B,IAAI;IAGE,AAAN,KAAK,CAAC,UAAU,CACJ,EAAsB,EACtB,GAAyB;;;YAGjC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;YACzB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;YAEvF,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YACzB,MAAM,KAAK,GAAG,EAAmB,CAAC;YAElC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAE5D,yBAAyB;YAEzB,IAAI,cAAc,GAAG,KAAK,CAAC,CAAC;YAE5B,8BAA8B;YAE9B,IAAI,UAAU,EAAE,CAAC;gBAEb,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAEzD,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC;oBACjB,QAAQ;oBACR,aAAa,EAAE,IAAI;oBACnB,UAAU,EAAE,IAAI;oBAChB,WAAW,EAAE;wBACT,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC;4BACrB,MAAM;4BACN,OAAO,EAAE,IAAI;yBAChB,CAAC;qBACL;iBACJ,CAAC,CAAC;gBAEH,oBAAoB;gBACpB,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC;oBACb,QAAQ;oBACR,QAAQ,EAAE,QAAQ;oBAClB,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,OAAO,GAAG,UAAU;oBACjC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBAC3B,cAAc,EAAE,IAAI,CAAC,YAAY;oBACjC,SAAS,EAAE,IAAI;iBAClB,CAAC,CAAC;gBAEH,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;gBAEvB,cAAc,GAAG,CAAC,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC;wBAC3C,QAAQ;qBACX,CAAC,CAAC,CAAC;gBAEJ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;oBACjC,IAAI,EAAE,UAAU;iBACnB,CAAC,CAAC,CAAC;gBACJ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;oBACjC,IAAI,EAAE,MAAM,GAAG,UAAU;iBAC5B,CAAC,CAAC,CAAC;gBAEJ,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;YAC3B,CAAC;YAED,MAAY,EAAE,kCAAG,MAAM,EAAE,CAAC,UAAU,CAAC,iBAAiB,EAAE,OAAA,CAAC;YAEzD,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;gBAC3B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;oBACjC,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,cAAc,EAAE;iBACvD,CAAC,CAAC,CAAC;YACR,CAAC;YAED,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACZ,IAAI,EAAE,IAAI,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG;gBAChD,WAAW,EAAE,GAAG;gBAChB,WAAW,EAAE,GAAG;gBAChB,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,kBAAkB;gBAC/B,SAAS,EAAE,IAAI,CAAC,MAAM;gBACtB,aAAa,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC;oBACjC,QAAQ,EAAE,IAAI;oBACd,KAAK;oBACL,UAAU;oBACV,SAAS,EAAE,OAAO,GAAG,UAAU;oBAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,KAAK,EAAE,IAAI;oBACX,cAAc;iBACjB,CAAC;aACL,CAAC,CAAC;YACH,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;YAEvB,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;;;;;;;;;;;QAElB,iFAAiF;IAErF,CAAC;CAEJ;AA/FS;IADL,cAAc;IAEV,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;;qCADM,iBAAiB;QAChB,mBAAmB;;0DA2FpC"}
|
package/package.json
CHANGED
|
@@ -9,6 +9,7 @@ import { globalServices } from "../../globalServices.js";
|
|
|
9
9
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
10
10
|
import VirtualHost from "./VirtualHost.js";
|
|
11
11
|
import { fileURLToPath } from "node:url";
|
|
12
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
12
13
|
// import { Worker } from "node:worker_threads";
|
|
13
14
|
|
|
14
15
|
const mainScript = fileURLToPath(import.meta.resolve("./VirtualServerMain.js"));
|
|
@@ -97,16 +98,13 @@ export default class ClusterWebWorker {
|
|
|
97
98
|
if (!this.initialized) {
|
|
98
99
|
return;
|
|
99
100
|
}
|
|
100
|
-
try {
|
|
101
|
-
unlink(this.socket).catch(() => void 0);
|
|
102
|
-
} catch {
|
|
103
|
-
// do nothing...
|
|
104
|
-
}
|
|
105
101
|
this.initialized = null;
|
|
106
|
-
console.log(
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
102
|
+
console.log(JSON.stringify({
|
|
103
|
+
serverID: this.server.server?.serverID,
|
|
104
|
+
pid: this.worker.pid,
|
|
105
|
+
action: "inactive worker disposed"
|
|
106
|
+
}))
|
|
107
|
+
this.killWorker().catch(ServerLogger.error);
|
|
110
108
|
};
|
|
111
109
|
|
|
112
110
|
public fetch = (url, { method = "GET", body, headers } = {} as any) => {
|
|
@@ -248,4 +246,42 @@ export default class ClusterWebWorker {
|
|
|
248
246
|
})();
|
|
249
247
|
}
|
|
250
248
|
|
|
249
|
+
async killWorker() {
|
|
250
|
+
try {
|
|
251
|
+
try {
|
|
252
|
+
await unlink(this.socket);
|
|
253
|
+
// @ts-expect-error readonly
|
|
254
|
+
delete this.socket;
|
|
255
|
+
} catch {
|
|
256
|
+
|
|
257
|
+
}
|
|
258
|
+
try {
|
|
259
|
+
await unlink(this.smtpSocket);
|
|
260
|
+
// @ts-expect-error readonly
|
|
261
|
+
delete this.smtpSocket;
|
|
262
|
+
} catch {
|
|
263
|
+
|
|
264
|
+
}
|
|
265
|
+
const worker = this.worker;
|
|
266
|
+
await new Promise<void>((resolve) => {
|
|
267
|
+
const timeout = setTimeout(() => {
|
|
268
|
+
worker.kill("SIGKILL");
|
|
269
|
+
}, 1000);
|
|
270
|
+
worker.on("exit", () => {
|
|
271
|
+
clearTimeout(timeout);
|
|
272
|
+
resolve();
|
|
273
|
+
});
|
|
274
|
+
worker.kill();
|
|
275
|
+
});
|
|
276
|
+
if(this.socket) {
|
|
277
|
+
await unlink(this.socket);
|
|
278
|
+
}
|
|
279
|
+
if(this.smtpSocket) {
|
|
280
|
+
await unlink(this.smtpSocket);
|
|
281
|
+
}
|
|
282
|
+
} catch {
|
|
283
|
+
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
|
|
251
287
|
}
|