@social-mail/social-mail-web-server 1.4.734 → 1.4.736
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/common/Hashtags.d.ts +1 -1
- package/dist/common/Hashtags.d.ts.map +1 -1
- package/dist/common/Hashtags.js +6 -1
- package/dist/common/Hashtags.js.map +1 -1
- package/dist/server/model/entities/CachedItem.d.ts +0 -2
- package/dist/server/model/entities/CachedItem.d.ts.map +1 -1
- package/dist/server/model/entities/CachedItem.js +3 -10
- package/dist/server/model/entities/CachedItem.js.map +1 -1
- package/dist/server/model/entities/Email.d.ts +10 -1
- package/dist/server/model/entities/Email.d.ts.map +1 -1
- package/dist/server/model/entities/Email.js +37 -2
- package/dist/server/model/entities/Email.js.map +1 -1
- package/dist/server/model/entities/Mailbox.d.ts +2 -1
- package/dist/server/model/entities/Mailbox.d.ts.map +1 -1
- package/dist/server/model/entities/Mailbox.js +6 -1
- package/dist/server/model/entities/Mailbox.js.map +1 -1
- package/dist/server/model/entities/MailboxContact.d.ts +9 -1
- package/dist/server/model/entities/MailboxContact.d.ts.map +1 -1
- package/dist/server/model/entities/MailboxContact.js +12 -3
- package/dist/server/model/entities/MailboxContact.js.map +1 -1
- package/dist/server/model/entities/MailboxContactEmail.d.ts +2 -0
- package/dist/server/model/entities/MailboxContactEmail.d.ts.map +1 -1
- package/dist/server/model/entities/MailboxContactEmail.js +13 -1
- package/dist/server/model/entities/MailboxContactEmail.js.map +1 -1
- package/dist/server/model/events/EmailEvents.d.ts.map +1 -1
- package/dist/server/model/events/EmailEvents.js +15 -2
- package/dist/server/model/events/EmailEvents.js.map +1 -1
- package/dist/server/model/events/MailboxContactEvents.d.ts.map +1 -1
- package/dist/server/model/events/MailboxContactEvents.js +32 -7
- package/dist/server/model/events/MailboxContactEvents.js.map +1 -1
- package/dist/server/model/events/UserEvents.d.ts.map +1 -1
- package/dist/server/model/events/UserEvents.js +4 -0
- package/dist/server/model/events/UserEvents.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/DBConfig.d.ts.map +1 -1
- package/dist/server/services/DBConfig.js +13 -9
- package/dist/server/services/DBConfig.js.map +1 -1
- package/dist/server/services/EmailAddressService.d.ts.map +1 -1
- package/dist/server/services/EmailAddressService.js +28 -23
- package/dist/server/services/EmailAddressService.js.map +1 -1
- package/dist/server/services/accounts/chart-of-accounts/ChartOfAccounts.d.ts.map +1 -1
- package/dist/server/services/accounts/chart-of-accounts/ChartOfAccounts.js +7 -15
- package/dist/server/services/accounts/chart-of-accounts/ChartOfAccounts.js.map +1 -1
- package/dist/server/services/cache/CacheService.d.ts +1 -2
- package/dist/server/services/cache/CacheService.d.ts.map +1 -1
- package/dist/server/services/cache/CacheService.js +66 -175
- package/dist/server/services/cache/CacheService.js.map +1 -1
- package/dist/server/services/email-logs/EmailLogService.d.ts.map +1 -1
- package/dist/server/services/email-logs/EmailLogService.js +7 -10
- package/dist/server/services/email-logs/EmailLogService.js.map +1 -1
- package/dist/server/services/files/AtomicFolderService.d.ts.map +1 -1
- package/dist/server/services/files/AtomicFolderService.js +13 -26
- package/dist/server/services/files/AtomicFolderService.js.map +1 -1
- package/dist/server/services/files/FileVersionService.d.ts.map +1 -1
- package/dist/server/services/files/FileVersionService.js +7 -10
- package/dist/server/services/files/FileVersionService.js.map +1 -1
- package/dist/server/services/files/SnapshotService.d.ts.map +1 -1
- package/dist/server/services/files/SnapshotService.js +17 -23
- package/dist/server/services/files/SnapshotService.js.map +1 -1
- package/dist/server/services/rate-limiter/RateLimiterService.d.ts.map +1 -1
- package/dist/server/services/rate-limiter/RateLimiterService.js +3 -6
- package/dist/server/services/rate-limiter/RateLimiterService.js.map +1 -1
- package/dist/server/services/tags/TagService.d.ts.map +1 -1
- package/dist/server/services/tags/TagService.js +2 -8
- package/dist/server/services/tags/TagService.js.map +1 -1
- package/dist/server/smtp/services/ChannelService.d.ts.map +1 -1
- package/dist/server/smtp/services/ChannelService.js +10 -24
- package/dist/server/smtp/services/ChannelService.js.map +1 -1
- package/dist/server/smtp/services/EmailReferenceService.d.ts +3 -0
- package/dist/server/smtp/services/EmailReferenceService.d.ts.map +1 -1
- package/dist/server/smtp/services/EmailReferenceService.js +154 -146
- package/dist/server/smtp/services/EmailReferenceService.js.map +1 -1
- package/dist/server/smtp/services/EmailSerializerService.d.ts.map +1 -1
- package/dist/server/smtp/services/EmailSerializerService.js +16 -3
- package/dist/server/smtp/services/EmailSerializerService.js.map +1 -1
- package/dist/server/smtp/services/EmailThreadService.d.ts +7 -0
- package/dist/server/smtp/services/EmailThreadService.d.ts.map +1 -0
- package/dist/server/smtp/services/EmailThreadService.js +24 -0
- package/dist/server/smtp/services/EmailThreadService.js.map +1 -0
- package/dist/server/smtp/services/EngagementService.d.ts.map +1 -1
- package/dist/server/smtp/services/EngagementService.js +28 -27
- package/dist/server/smtp/services/EngagementService.js.map +1 -1
- package/dist/server/smtp/services/MailReceiverService.d.ts.map +1 -1
- package/dist/server/smtp/services/MailReceiverService.js +4 -7
- package/dist/server/smtp/services/MailReceiverService.js.map +1 -1
- package/dist/server/storage/BaseStorage.d.ts.map +1 -1
- package/dist/server/storage/BaseStorage.js +8 -11
- package/dist/server/storage/BaseStorage.js.map +1 -1
- package/dist/server/storage/db/DbStorage.d.ts.map +1 -1
- package/dist/server/storage/db/DbStorage.js +7 -13
- package/dist/server/storage/db/DbStorage.js.map +1 -1
- package/dist/server/workflows/SocialWorkflowContext.d.ts.map +1 -1
- package/dist/server/workflows/SocialWorkflowContext.js +2 -0
- package/dist/server/workflows/SocialWorkflowContext.js.map +1 -1
- package/dist/server/workflows/channel/BroadcastEmail.d.ts.map +1 -1
- package/dist/server/workflows/channel/BroadcastEmail.js +7 -10
- package/dist/server/workflows/channel/BroadcastEmail.js.map +1 -1
- package/dist/server/workflows/channel/invite/SendChannelInvitation.d.ts.map +1 -1
- package/dist/server/workflows/channel/invite/SendChannelInvitation.js +7 -17
- package/dist/server/workflows/channel/invite/SendChannelInvitation.js.map +1 -1
- package/dist/server/workflows/email/UpdateTagsWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/email/UpdateTagsWorkflow.js +3 -10
- package/dist/server/workflows/email/UpdateTagsWorkflow.js.map +1 -1
- package/dist/server/workflows/incoming/UpdateMailboxThreads.d.ts.map +1 -1
- package/dist/server/workflows/incoming/UpdateMailboxThreads.js +15 -31
- package/dist/server/workflows/incoming/UpdateMailboxThreads.js.map +1 -1
- package/dist/server/workflows/repair/conversations/RepairConversationWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/repair/conversations/RepairConversationWorkflow.js +1 -0
- package/dist/server/workflows/repair/conversations/RepairConversationWorkflow.js.map +1 -1
- package/dist/server/workflows/repair/counts/RepairEmailCountsWorkflow.d.ts +12 -0
- package/dist/server/workflows/repair/counts/RepairEmailCountsWorkflow.d.ts.map +1 -0
- package/dist/server/workflows/repair/counts/RepairEmailCountsWorkflow.js +151 -0
- package/dist/server/workflows/repair/counts/RepairEmailCountsWorkflow.js.map +1 -0
- package/dist/server/workflows/search/IndexAppFilesWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/search/IndexAppFilesWorkflow.js +6 -16
- package/dist/server/workflows/search/IndexAppFilesWorkflow.js.map +1 -1
- package/dist/server/workflows/smtp/DispatchEmailToMX.d.ts.map +1 -1
- package/dist/server/workflows/smtp/DispatchEmailToMX.js +14 -34
- package/dist/server/workflows/smtp/DispatchEmailToMX.js.map +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.d.ts.map +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.js +7 -10
- package/dist/server/workflows/smtp/MailDispatcherService.js.map +1 -1
- package/dist/server/workflows/sync/SyncMailboxWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/sync/SyncMailboxWorkflow.js +1 -7
- package/dist/server/workflows/sync/SyncMailboxWorkflow.js.map +1 -1
- package/dist/tests/createTest.d.ts +5 -1
- package/dist/tests/createTest.d.ts.map +1 -1
- package/dist/tests/createTest.js +115 -36
- package/dist/tests/createTest.js.map +1 -1
- package/dist/tests/services/channels/common.d.ts.map +1 -1
- package/dist/tests/services/channels/common.js +6 -9
- package/dist/tests/services/channels/common.js.map +1 -1
- package/dist/tests/services/channels/private-channel-test.js +6 -9
- package/dist/tests/services/channels/private-channel-test.js.map +1 -1
- package/dist/tests/threads/bcc-test.d.ts +2 -0
- package/dist/tests/threads/bcc-test.d.ts.map +1 -0
- package/dist/tests/threads/bcc-test.js +60 -0
- package/dist/tests/threads/bcc-test.js.map +1 -0
- package/dist/tests/threads/thread-test.d.ts +2 -0
- package/dist/tests/threads/thread-test.d.ts.map +1 -0
- package/dist/tests/threads/thread-test.js +184 -0
- package/dist/tests/threads/thread-test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/social-mail/social/buttons/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/social/buttons/get.js +1 -4
- package/dist/wwwroot/routes/social-mail/social/buttons/get.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/social/buttons-3x/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/social/buttons-3x/get.js +1 -4
- package/dist/wwwroot/routes/social-mail/social/buttons-3x/get.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/social/t/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/social/t/index.js +1 -4
- package/dist/wwwroot/routes/social-mail/social/t/index.js.map +1 -1
- package/package.json +8 -8
- package/src/common/Hashtags.ts +6 -1
- package/src/server/model/entities/CachedItem.ts +3 -8
- package/src/server/model/entities/Email.ts +40 -3
- package/src/server/model/entities/Mailbox.ts +13 -1
- package/src/server/model/entities/MailboxContact.ts +19 -2
- package/src/server/model/entities/MailboxContactEmail.ts +12 -1
- package/src/server/model/events/EmailEvents.ts +18 -3
- package/src/server/model/events/MailboxContactEvents.ts +40 -8
- package/src/server/model/events/UserEvents.ts +4 -0
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/DBConfig.ts +14 -10
- package/src/server/services/EmailAddressService.ts +28 -23
- package/src/server/services/accounts/chart-of-accounts/ChartOfAccounts.ts +7 -15
- package/src/server/services/cache/CacheService.ts +165 -147
- package/src/server/services/email-logs/EmailLogService.ts +7 -10
- package/src/server/services/files/AtomicFolderService.ts +5 -18
- package/src/server/services/files/FileVersionService.ts +7 -10
- package/src/server/services/files/SnapshotService.ts +17 -23
- package/src/server/services/rate-limiter/RateLimiterService.ts +3 -6
- package/src/server/services/tags/TagService.ts +2 -8
- package/src/server/smtp/services/ChannelService.ts +10 -24
- package/src/server/smtp/services/EmailReferenceService.ts +173 -152
- package/src/server/smtp/services/EmailSerializerService.ts +19 -3
- package/src/server/smtp/services/EmailThreadService.ts +15 -0
- package/src/server/smtp/services/EngagementService.ts +30 -28
- package/src/server/smtp/services/MailReceiverService.ts +4 -7
- package/src/server/storage/BaseStorage.ts +8 -11
- package/src/server/storage/db/DbStorage.ts +7 -13
- package/src/server/workflows/SocialWorkflowContext.ts +2 -0
- package/src/server/workflows/channel/BroadcastEmail.ts +7 -10
- package/src/server/workflows/channel/invite/SendChannelInvitation.ts +7 -17
- package/src/server/workflows/email/UpdateTagsWorkflow.ts +3 -10
- package/src/server/workflows/incoming/UpdateMailboxThreads.ts +7 -21
- package/src/server/workflows/repair/conversations/RepairConversationWorkflow.ts +3 -0
- package/src/server/workflows/repair/counts/RepairEmailCountsWorkflow.ts +142 -0
- package/src/server/workflows/search/IndexAppFilesWorkflow.ts +7 -15
- package/src/server/workflows/smtp/DispatchEmailToMX.ts +14 -34
- package/src/server/workflows/smtp/MailDispatcherService.ts +7 -10
- package/src/server/workflows/sync/SyncMailboxWorkflow.ts +1 -7
- package/src/tests/createTest.ts +101 -18
- package/src/tests/services/channels/common.ts +6 -9
- package/src/tests/services/channels/private-channel-test.ts +6 -9
- package/src/tests/threads/bcc-test.ts +71 -0
- package/src/tests/threads/thread-test.ts +207 -0
- package/src/wwwroot/routes/social-mail/social/buttons/get.tsx +1 -4
- package/src/wwwroot/routes/social-mail/social/buttons-3x/get.tsx +1 -4
- package/src/wwwroot/routes/social-mail/social/t/index.tsx +1 -4
|
@@ -62,10 +62,9 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
|
62
62
|
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
63
63
|
import { unlinkSync } from "fs";
|
|
64
64
|
import { parse } from "path";
|
|
65
|
-
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
66
|
-
import sleep from "../../../common/sleep.js";
|
|
67
65
|
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
68
66
|
import { appendFile } from "fs/promises";
|
|
67
|
+
import DbLockService from "../db-lock/DbLockService.js";
|
|
69
68
|
export class CachedFile {
|
|
70
69
|
constructor(fileName, contentType, filePath) {
|
|
71
70
|
this.fileName = fileName;
|
|
@@ -90,7 +89,7 @@ let CacheService = class CacheService {
|
|
|
90
89
|
for (const iterator of files) {
|
|
91
90
|
const cloudPath = `cache/${iterator.itemID}`;
|
|
92
91
|
await this.storage.deleteFile(cloudPath);
|
|
93
|
-
await this.db.cachedItems.
|
|
92
|
+
await this.db.cachedItems.statements.delete(iterator);
|
|
94
93
|
}
|
|
95
94
|
}
|
|
96
95
|
async getItemsOrFail(keys, name, contentType) {
|
|
@@ -155,14 +154,11 @@ let CacheService = class CacheService {
|
|
|
155
154
|
const db = scope.resolve(SocialMailContext);
|
|
156
155
|
const expiry = DateTime.now.add(ttl);
|
|
157
156
|
const keyHash = await this.cryptoService.hashBuffer(Buffer.from(key, "utf-8"));
|
|
158
|
-
const cachedItem = await db.cachedItems.
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
ready: true,
|
|
164
|
-
expiry
|
|
165
|
-
}
|
|
157
|
+
const cachedItem = await db.cachedItems.statements.insert({
|
|
158
|
+
keyHash,
|
|
159
|
+
key,
|
|
160
|
+
ready: true,
|
|
161
|
+
expiry
|
|
166
162
|
});
|
|
167
163
|
const cloudPath = `cache/${cachedItem.itemID}`;
|
|
168
164
|
await this.storage.createFile(cloudPath, file);
|
|
@@ -176,185 +172,76 @@ let CacheService = class CacheService {
|
|
|
176
172
|
}
|
|
177
173
|
}
|
|
178
174
|
async get({ key, ttl, factory }) {
|
|
179
|
-
const
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
const env_6 = { stack: [], error: void 0, hasError: false };
|
|
198
|
-
try {
|
|
199
|
-
// delete cache...
|
|
200
|
-
const scope = __addDisposableResource(env_6, globalServices.createScope(), false);
|
|
201
|
-
const db = scope.resolve(SocialMailContext);
|
|
202
|
-
await db.cachedItems.saveDirect({
|
|
203
|
-
mode: "delete",
|
|
204
|
-
keys: {
|
|
205
|
-
itemID: cachedItem.itemID
|
|
206
|
-
}
|
|
207
|
-
});
|
|
208
|
-
throw new Error(`Failed: ${error.stack ?? error}`);
|
|
209
|
-
}
|
|
210
|
-
catch (e_4) {
|
|
211
|
-
env_6.error = e_4;
|
|
212
|
-
env_6.hasError = true;
|
|
213
|
-
}
|
|
214
|
-
finally {
|
|
215
|
-
__disposeResources(env_6);
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
catch (e_5) {
|
|
220
|
-
env_5.error = e_5;
|
|
221
|
-
env_5.hasError = true;
|
|
222
|
-
}
|
|
223
|
-
finally {
|
|
224
|
-
const result_1 = __disposeResources(env_5);
|
|
225
|
-
if (result_1)
|
|
226
|
-
await result_1;
|
|
175
|
+
const env_4 = { stack: [], error: void 0, hasError: false };
|
|
176
|
+
try {
|
|
177
|
+
const now = DateTime.now;
|
|
178
|
+
const dbLock = __addDisposableResource(env_4, await this.dbLockService.lock(`ci-${key}`, DateTime.now.addMinutes(5)), true);
|
|
179
|
+
const keyHash = await this.cryptoService.hashBuffer(Buffer.from(key, "utf-8"));
|
|
180
|
+
const keys = { key, keyHash };
|
|
181
|
+
let cachedItem = await this.db.cachedItems.statements.select({}, keys);
|
|
182
|
+
const { base: fileName } = parse(key);
|
|
183
|
+
let added = false;
|
|
184
|
+
let file;
|
|
185
|
+
let cloudPath;
|
|
186
|
+
const expiry = now.add(ttl);
|
|
187
|
+
if (cachedItem) {
|
|
188
|
+
if (DateTime.from(cachedItem.expiry).msSinceEpoch > Date.now()) {
|
|
189
|
+
if (cachedItem.slide) {
|
|
190
|
+
await this.db.cachedItems.statements.update({
|
|
191
|
+
expiry,
|
|
192
|
+
}, { itemID: cachedItem.itemID });
|
|
227
193
|
}
|
|
194
|
+
cloudPath = `cache/${cachedItem.itemID}`;
|
|
195
|
+
return this.tempFileService.downloadCloudFile(cloudPath, fileName);
|
|
228
196
|
}
|
|
197
|
+
cachedItem.expiry = DateTime.now.addDays(30);
|
|
198
|
+
await this.db.cachedItems.statements.update({
|
|
199
|
+
expiry,
|
|
200
|
+
}, { itemID: cachedItem.itemID });
|
|
229
201
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
202
|
+
if (!cachedItem) {
|
|
203
|
+
cachedItem = await this.db.cachedItems.statements.selectOrInsert({
|
|
204
|
+
...keys,
|
|
205
|
+
ready: false,
|
|
206
|
+
slide: true,
|
|
207
|
+
expiry,
|
|
208
|
+
}, keys);
|
|
209
|
+
added = true;
|
|
233
210
|
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
211
|
+
cloudPath = `cache/${cachedItem.itemID}`;
|
|
212
|
+
try {
|
|
213
|
+
file = await factory();
|
|
214
|
+
await this.storage.createFile(cloudPath, file);
|
|
238
215
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
return file;
|
|
242
|
-
}
|
|
243
|
-
async lockCachedItem(item, max = DateTime.now.addMinutes(1)) {
|
|
244
|
-
let old = Promise.resolve(0);
|
|
245
|
-
const renewLock = async (a) => {
|
|
246
|
-
const prev = old;
|
|
247
|
-
return old = (async () => {
|
|
248
|
-
const env_7 = { stack: [], error: void 0, hasError: false };
|
|
216
|
+
catch (error) {
|
|
217
|
+
const env_5 = { stack: [], error: void 0, hasError: false };
|
|
249
218
|
try {
|
|
250
|
-
|
|
251
|
-
const scope = __addDisposableResource(
|
|
219
|
+
// delete cache...
|
|
220
|
+
const scope = __addDisposableResource(env_5, globalServices.createScope(), false);
|
|
252
221
|
const db = scope.resolve(SocialMailContext);
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
}
|
|
257
|
-
if (copy.lockExpiry && DateTime.from(copy.lockExpiry).msSinceEpoch <= DateTime.now.msSinceEpoch) {
|
|
258
|
-
// we can discard...
|
|
259
|
-
await db.cachedItems.saveDirect({
|
|
260
|
-
mode: "update",
|
|
261
|
-
keys: { itemID: a.itemID },
|
|
262
|
-
changes: {
|
|
263
|
-
lockExpiry: null,
|
|
264
|
-
lockToken: null
|
|
265
|
-
}
|
|
266
|
-
});
|
|
267
|
-
}
|
|
268
|
-
a.lockExpiry = DateTime.now.addSeconds(15);
|
|
269
|
-
return await db.cachedItems
|
|
270
|
-
.where(a, (p) => (x) => x.itemID === p.itemID && (x.lockToken === p.lockToken || x.lockToken === null))
|
|
271
|
-
.update(a, (p) => (x) => ({
|
|
272
|
-
lockExpiry: Sql.cast.asDateTime(p.lockExpiry),
|
|
273
|
-
ready: Sql.cast.asBoolean(p.ready)
|
|
274
|
-
}));
|
|
222
|
+
await db.cachedItems.statements.delete({
|
|
223
|
+
itemID: cachedItem.itemID
|
|
224
|
+
});
|
|
225
|
+
throw new Error(`Failed: ${error.stack ?? error}`);
|
|
275
226
|
}
|
|
276
|
-
catch (
|
|
277
|
-
|
|
278
|
-
|
|
227
|
+
catch (e_4) {
|
|
228
|
+
env_5.error = e_4;
|
|
229
|
+
env_5.hasError = true;
|
|
279
230
|
}
|
|
280
231
|
finally {
|
|
281
|
-
__disposeResources(
|
|
232
|
+
__disposeResources(env_5);
|
|
282
233
|
}
|
|
283
|
-
})();
|
|
284
|
-
};
|
|
285
|
-
while (true) {
|
|
286
|
-
if (Date.now() >= max.msSinceEpoch) {
|
|
287
|
-
throw new Error(`Unable to acquire lock on ${item.itemID}`);
|
|
288
|
-
}
|
|
289
|
-
let locked = await renewLock(item);
|
|
290
|
-
if (locked === null) {
|
|
291
|
-
return;
|
|
292
234
|
}
|
|
293
|
-
|
|
294
|
-
if (locked) {
|
|
295
|
-
setInterval(async () => {
|
|
296
|
-
try {
|
|
297
|
-
locked = await renewLock(item);
|
|
298
|
-
}
|
|
299
|
-
catch (error) {
|
|
300
|
-
// eslint-disable-next-line no-console
|
|
301
|
-
console.error(error);
|
|
302
|
-
}
|
|
303
|
-
}, 5000);
|
|
304
|
-
return {
|
|
305
|
-
async [Symbol.asyncDispose]() {
|
|
306
|
-
item.lockExpiry = null;
|
|
307
|
-
item.lockToken = null;
|
|
308
|
-
item.ready = true;
|
|
309
|
-
await renewLock(item);
|
|
310
|
-
}
|
|
311
|
-
};
|
|
312
|
-
}
|
|
313
|
-
await sleep(5000);
|
|
314
|
-
}
|
|
315
|
-
}
|
|
316
|
-
async getCachedItem(key, expiry, ttl) {
|
|
317
|
-
const env_8 = { stack: [], error: void 0, hasError: false };
|
|
318
|
-
try {
|
|
319
|
-
// New scope is created to isolate
|
|
320
|
-
// database from existing running transaction
|
|
321
|
-
// in case this was called within a transaction scope.
|
|
322
|
-
const scope = __addDisposableResource(env_8, globalServices.createScope(), false);
|
|
323
|
-
const db = scope.resolve(SocialMailContext);
|
|
324
|
-
const keyHash = await this.cryptoService.hashBuffer(Buffer.from(key, "utf-8"));
|
|
325
|
-
const cachedItem = await db.cachedItems.saveDirect({
|
|
326
|
-
mode: "selectOrInsert",
|
|
327
|
-
keys: {
|
|
328
|
-
keyHash,
|
|
329
|
-
key
|
|
330
|
-
},
|
|
331
|
-
changes: {
|
|
332
|
-
key,
|
|
333
|
-
keyHash,
|
|
334
|
-
expiry
|
|
335
|
-
}
|
|
336
|
-
}, 5);
|
|
337
|
-
if (DateTime.from(cachedItem.expiry).msSinceEpoch < Date.now()) {
|
|
338
|
-
if (!cachedItem.slide) {
|
|
339
|
-
// delete this..
|
|
340
|
-
await this.storage.deleteFile(`cache/${cachedItem.itemID}`);
|
|
341
|
-
cachedItem.expiry = expiry;
|
|
342
|
-
await db.cachedItems.where(cachedItem, (p) => (x) => x.itemID === p.itemID)
|
|
343
|
-
.update(cachedItem, (p) => (x) => ({ expiry: p.expiry }));
|
|
344
|
-
}
|
|
345
|
-
}
|
|
346
|
-
if (cachedItem.slide && cachedItem.ready) {
|
|
347
|
-
await db.cachedItems.where(cachedItem, (p) => (x) => x.itemID === p.itemID)
|
|
348
|
-
.update(cachedItem, (p) => (x) => ({ expiry: Sql.date.addDays(x.expiry, 30) }));
|
|
349
|
-
}
|
|
350
|
-
return cachedItem;
|
|
235
|
+
return this.tempFileService.downloadCloudFile(cloudPath, fileName);
|
|
351
236
|
}
|
|
352
|
-
catch (
|
|
353
|
-
|
|
354
|
-
|
|
237
|
+
catch (e_5) {
|
|
238
|
+
env_4.error = e_5;
|
|
239
|
+
env_4.hasError = true;
|
|
355
240
|
}
|
|
356
241
|
finally {
|
|
357
|
-
__disposeResources(
|
|
242
|
+
const result_1 = __disposeResources(env_4);
|
|
243
|
+
if (result_1)
|
|
244
|
+
await result_1;
|
|
358
245
|
}
|
|
359
246
|
}
|
|
360
247
|
};
|
|
@@ -374,6 +261,10 @@ __decorate([
|
|
|
374
261
|
Inject,
|
|
375
262
|
__metadata("design:type", TempFileService)
|
|
376
263
|
], CacheService.prototype, "tempFileService", void 0);
|
|
264
|
+
__decorate([
|
|
265
|
+
Inject,
|
|
266
|
+
__metadata("design:type", DbLockService)
|
|
267
|
+
], CacheService.prototype, "dbLockService", void 0);
|
|
377
268
|
CacheService = __decorate([
|
|
378
269
|
RegisterScoped
|
|
379
270
|
], CacheService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAqB,MAAM,4CAA4C,CAAC;AACvG,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailLogService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/email-logs/EmailLogService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAQ/D,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,WAAW,CAAC;IAGrB,GAAG,EAAE,eAAe,CAAC;IAEf,QAAQ,CAAC,OAAO,KAAA,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,GAAE,MAAa;
|
|
1
|
+
{"version":3,"file":"EmailLogService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/email-logs/EmailLogService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAQ/D,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,WAAW,CAAC;IAGrB,GAAG,EAAE,eAAe,CAAC;IAEf,QAAQ,CAAC,OAAO,KAAA,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,GAAE,MAAa;IA4CjE,IAAI,CAAC,EAAE,KAAS,EAAE,SAAc,EAAE,WAAkB,EAAE,QAAqB,EAAC;;;;;KAAA;CAgBrF"}
|
|
@@ -28,16 +28,13 @@ let EmailLogService = class EmailLogService {
|
|
|
28
28
|
const cloudPath = `email-files/${dateCreated.year}-${String(dateCreated.month).padStart(2, '0')}-${String(dateCreated.day).padStart(2, '0')}/${randomUUID()}/${file.fileName}/email.log.gz`;
|
|
29
29
|
const compressed = await tfs.createFrom(file.fileName + ".gz", GZip.zip(file.openRead()), "text/plain");
|
|
30
30
|
await this.storage.createFile(cloudPath, compressed);
|
|
31
|
-
const log = await db.emailLogs.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
cloudPath,
|
|
39
|
-
compression
|
|
40
|
-
}
|
|
31
|
+
const log = await db.emailLogs.statements.insert({
|
|
32
|
+
emailID,
|
|
33
|
+
fileName: file.fileName,
|
|
34
|
+
fileSize: file.contentSize,
|
|
35
|
+
dateCreated,
|
|
36
|
+
cloudPath,
|
|
37
|
+
compression
|
|
41
38
|
});
|
|
42
39
|
let lastError;
|
|
43
40
|
// we will make sure that we succeed once...
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailLogService.js","sourceRoot":"","sources":["../../../../src/server/services/email-logs/EmailLogService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAqB,MAAM,4CAA4C,CAAC;AAEvG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,IAAI,MAAM,iCAAiC,CAAC;AACnD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,eAAe,GAArB,MAAM,eAAe;IAWhC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAa,EAAE,GAAW;QAC9C,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,IAAe,EAAE,cAAsB,IAAI;QACnE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAEzB,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QAEjC,MAAM,SAAS,GAAG,eAAe,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,UAAU,EAAE,IAAI,IAAI,CAAC,QAAQ,eAAe,CAAC;QAE5L,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QACxG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAErD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC
|
|
1
|
+
{"version":3,"file":"EmailLogService.js","sourceRoot":"","sources":["../../../../src/server/services/email-logs/EmailLogService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAqB,MAAM,4CAA4C,CAAC;AAEvG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,IAAI,MAAM,iCAAiC,CAAC;AACnD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,eAAe,GAArB,MAAM,eAAe;IAWhC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAa,EAAE,GAAW;QAC9C,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,IAAe,EAAE,cAAsB,IAAI;QACnE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAEzB,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QAEjC,MAAM,SAAS,GAAG,eAAe,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,UAAU,EAAE,IAAI,IAAI,CAAC,QAAQ,eAAe,CAAC;QAE5L,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QACxG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAErD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC;YAC7C,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,WAAW;YAC1B,WAAW;YACX,SAAS;YACT,WAAW;SACd,CAAC,CAAC;QAEH,IAAI,SAAS,CAAC;QAEd,4CAA4C;QAC5C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC;gBACD,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;qBAC5F,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC/C,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC/C,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;iBAC9B,CAAC,CAAC,CAAC;YACZ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,SAAS,GAAG,KAAK,CAAC;gBAClB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClB,SAAS;YACb,CAAC;YACD,OAAO,GAAG,CAAC;QACf,CAAC;QAED,IAAG,SAAS,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,WAAW,GAAG,IAAI,EAAE,QAAQ,GAAG,UAAU,EAAC;QAC9E,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;YAC9F,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;YACxB,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;YAC5B,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC1B,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,MAAM,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;QAChG,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CAEJ,CAAA;AA1EG;IADC,MAAM;8BACH,iBAAiB;2CAAC;AAGtB;IADC,MAAM;8BACE,WAAW;gDAAC;AAGrB;IADC,MAAM;8BACF,eAAe;4CAAC;AATJ,eAAe;IADnC,cAAc;GACM,eAAe,CA6EnC;eA7EoB,eAAe"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AtomicFolderService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/AtomicFolderService.ts"],"names":[],"mappings":"AAIA,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAItD,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,OAAO,CAAC,EAAE,CAAoB;IAExB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"AtomicFolderService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/AtomicFolderService.ts"],"names":[],"mappings":"AAIA,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAItD,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,OAAO,CAAC,EAAE,CAAoB;IAExB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CA2B9C"}
|
|
@@ -15,35 +15,22 @@ let AtomicFolderService = class AtomicFolderService {
|
|
|
15
15
|
async create(parentID, name) {
|
|
16
16
|
const dateCreated = DateTime.now;
|
|
17
17
|
const dateUpdated = dateCreated;
|
|
18
|
-
const folder = await this.db.appFiles.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
name,
|
|
29
|
-
isFolder: true,
|
|
30
|
-
fileSize: 0,
|
|
31
|
-
contentType: "folder",
|
|
32
|
-
dateCreated,
|
|
33
|
-
dateUpdated
|
|
34
|
-
}
|
|
35
|
-
}, 5);
|
|
18
|
+
const folder = await this.db.appFiles.statements.selectOrInsert({
|
|
19
|
+
parentID,
|
|
20
|
+
name,
|
|
21
|
+
isDeleted: false,
|
|
22
|
+
isFolder: true,
|
|
23
|
+
fileSize: 0,
|
|
24
|
+
contentType: "folder",
|
|
25
|
+
dateCreated,
|
|
26
|
+
dateUpdated
|
|
27
|
+
}, void 0, 5);
|
|
36
28
|
if (!folder.path) {
|
|
37
29
|
const parent = await this.db.appFiles.where({ parentID }, (p) => (x) => x.appFileID === p.parentID).first();
|
|
38
30
|
folder.path = `${parent.path}${folder.appFileID}/`;
|
|
39
|
-
await this.db.appFiles.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
appFileID: folder.appFileID
|
|
43
|
-
},
|
|
44
|
-
changes: {
|
|
45
|
-
path: folder.path
|
|
46
|
-
}
|
|
31
|
+
await this.db.appFiles.statements.update({
|
|
32
|
+
appFileID: folder.appFileID,
|
|
33
|
+
path: folder.path
|
|
47
34
|
});
|
|
48
35
|
}
|
|
49
36
|
return folder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AtomicFolderService.js","sourceRoot":"","sources":["../../../../src/server/services/files/AtomicFolderService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAKpC,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,IAAY;QACvC,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,MAAM,WAAW,GAAG,WAAW,CAAC;QAEhC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC
|
|
1
|
+
{"version":3,"file":"AtomicFolderService.js","sourceRoot":"","sources":["../../../../src/server/services/files/AtomicFolderService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAKpC,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,IAAY;QACvC,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,MAAM,WAAW,GAAG,WAAW,CAAC;QAEhC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;YACxD,QAAQ;YACR,IAAI;YACJ,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,QAAQ;YACrB,WAAW;YACX,WAAW;SAClB,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAEd,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;YAC5G,MAAM,CAAC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,SAAS,GAAG,CAAC;YACnD,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;gBACrC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAC;QACP,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ,CAAA;AA7BW;IADP,MAAM;8BACK,iBAAiB;+CAAC;AAHb,mBAAmB;IADvC,iBAAiB;GACG,mBAAmB,CAgCvC;eAhCoB,mBAAmB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileVersionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/FileVersionService.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAItD,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAGnF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEtB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"FileVersionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/FileVersionService.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAItD,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAGnF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEtB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;CAgC5D"}
|
|
@@ -14,16 +14,13 @@ let FileVersionService = class FileVersionService {
|
|
|
14
14
|
const dateCreated = DateTime.now;
|
|
15
15
|
db.verifyFilters = false;
|
|
16
16
|
db.raiseEvents = false;
|
|
17
|
-
await db.fileVersions.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
name: file.name,
|
|
25
|
-
dateCreated
|
|
26
|
-
}
|
|
17
|
+
await db.fileVersions.statements.insert({
|
|
18
|
+
fileID: file.appFileID,
|
|
19
|
+
userID,
|
|
20
|
+
sessionID,
|
|
21
|
+
fileContentID: file.fileContentID,
|
|
22
|
+
name: file.name,
|
|
23
|
+
dateCreated
|
|
27
24
|
});
|
|
28
25
|
await db.appFiles.where(file, (p) => (x) => x.appFileID === p.appFileID)
|
|
29
26
|
.update(void 0, (p) => (x) => ({ versions: x.versions === null ? 0 : x.versions + 1 }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileVersionService.js","sourceRoot":"","sources":["../../../../src/server/services/files/FileVersionService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7F,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI5D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE5B,KAAK,CAAC,WAAW,CAAC,IAAiB,EAAE,IAAa;QACrD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QACzC,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QACzB,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;QACvB,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC
|
|
1
|
+
{"version":3,"file":"FileVersionService.js","sourceRoot":"","sources":["../../../../src/server/services/files/FileVersionService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7F,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI5D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE5B,KAAK,CAAC,WAAW,CAAC,IAAiB,EAAE,IAAa;QACrD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QACzC,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QACzB,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;QACvB,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC;YACpC,MAAM,EAAE,IAAI,CAAC,SAAS;YACtB,MAAM;YACN,SAAS;YACT,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW;SACd,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aACnE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5F,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,qBAAqB;YACrB,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ;iBACnB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,QAAQ,CAAC;iBACrD,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;gBACd,OAAO;YACX,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAQ,CAAC;QACnD,MAAM,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,UAAU,CAAC;aACnF,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;CAEJ,CAAA;AAlCoB,kBAAkB;IADtC,cAAc;GACM,kBAAkB,CAkCtC;eAlCoB,kBAAkB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SnapshotService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/SnapshotService.ts"],"names":[],"mappings":"AAGA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,OAAO,MAAM,iCAAiC,CAAC;AACtD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AA+B/D,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,WAAW,CAAC;IAGrB,eAAe,EAAE,eAAe,CAAC;IAEjC,IAAI,EAAE,OAAO,CAAC;IAEd,SAAS,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAG,CAAM;IAExE,QAAQ,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAG,CAAM;IACvE,YAAY,EAAE,OAAO,CAAC;IAEtB,QAAQ,EAAE,OAAO,EAAE,CAAQ;IAE3B,aAAa,EAAE,OAAO,EAAE,CAAM;IAE9B,OAAO,mBAA0B;IAEjC,YAAY,EAAE,MAAM,CAAK;IAEnB,cAAc,CAAC,QAAQ,KAAA,EAAE,WAAW,cAAsB;
|
|
1
|
+
{"version":3,"file":"SnapshotService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/SnapshotService.ts"],"names":[],"mappings":"AAGA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,OAAO,MAAM,iCAAiC,CAAC;AACtD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AA+B/D,MAAM,CAAC,OAAO,OAAO,eAAe;IAGhC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,WAAW,CAAC;IAGrB,eAAe,EAAE,eAAe,CAAC;IAEjC,IAAI,EAAE,OAAO,CAAC;IAEd,SAAS,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAG,CAAM;IAExE,QAAQ,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAG,CAAM;IACvE,YAAY,EAAE,OAAO,CAAC;IAEtB,QAAQ,EAAE,OAAO,EAAE,CAAQ;IAE3B,aAAa,EAAE,OAAO,EAAE,CAAM;IAE9B,OAAO,mBAA0B;IAEjC,YAAY,EAAE,MAAM,CAAK;IAEnB,cAAc,CAAC,QAAQ,KAAA,EAAE,WAAW,cAAsB;IAkF1D,YAAY,CAAC,EAAE,EAAE,iBAAiB,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,UAAO,EAAE,QAAQ,SAAK;IAmDvH,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAwCtD;;;;;;OAMG;IAEG,eAAe,CAAC,MAAM,KAAA,EAAE,IAAI,KAAA,EAAC,QAAQ,KAAA;IA2B3C,SAAS,CAAC,IAAI,EAAE,MAAM;;;;IAchB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAgElE,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAC,QAAQ,EAAE,MAAM;IAoGnE,uBAAuB,CAAC,aAAa,KAAA,EAAE,IAAI,KAAA;IAkB3C,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,SAA8B,GAAG,OAAO,CAAC,OAAO,CAAC;IAQ/F,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,KAAA,GAAG,OAAO,CAAC,OAAO,CAAC;CAiB3E"}
|
|
@@ -56,18 +56,15 @@ let SnapshotService = class SnapshotService {
|
|
|
56
56
|
const dateUpdated = dateCreated;
|
|
57
57
|
let creatorID = void 0;
|
|
58
58
|
creatorID = sessionUser?.userID;
|
|
59
|
-
const snapshotRoot = await db.appFiles.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
dateCreated,
|
|
69
|
-
dateUpdated
|
|
70
|
-
}
|
|
59
|
+
const snapshotRoot = await db.appFiles.statements.insert({
|
|
60
|
+
...folder,
|
|
61
|
+
contentType: "snapshot",
|
|
62
|
+
appFileID: void 0,
|
|
63
|
+
parentID: null,
|
|
64
|
+
creatorID,
|
|
65
|
+
path: null,
|
|
66
|
+
dateCreated,
|
|
67
|
+
dateUpdated
|
|
71
68
|
});
|
|
72
69
|
const path = `${snapshotRoot.appFileID}/`;
|
|
73
70
|
this.snapshotFiles.push(snapshotRoot);
|
|
@@ -120,17 +117,14 @@ let SnapshotService = class SnapshotService {
|
|
|
120
117
|
continue;
|
|
121
118
|
}
|
|
122
119
|
}
|
|
123
|
-
const child = await db.appFiles.
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
dateCreated,
|
|
132
|
-
dateUpdated
|
|
133
|
-
}
|
|
120
|
+
const child = await db.appFiles.statements.insert({
|
|
121
|
+
...iterator,
|
|
122
|
+
contentType: iterator.isFolder ? "snapshot" : iterator.contentType,
|
|
123
|
+
appFileID: void 0,
|
|
124
|
+
parentID: dest.appFileID,
|
|
125
|
+
path: null,
|
|
126
|
+
dateCreated,
|
|
127
|
+
dateUpdated
|
|
134
128
|
});
|
|
135
129
|
dest.children.push(child);
|
|
136
130
|
this.snapshotFiles.push(child);
|