@dimah-s3/db 2.0.0-beta.5 → 2.0.0-beta.6
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/README.md +15 -6
- package/dist/adapters/drizzle.d.ts +2 -3
- package/dist/adapters/drizzle.d.ts.map +1 -1
- package/dist/adapters/kysely.d.ts +1 -1
- package/dist/adapters/prisma.d.ts +1 -1
- package/dist/cli.d.ts +17 -12
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +41 -74
- package/dist/cli.js.map +1 -1
- package/dist/fuma-db.d.ts +19 -22
- package/dist/fuma-db.d.ts.map +1 -1
- package/dist/index.js +59 -79
- package/dist/index.js.map +1 -1
- package/dist/schema/schema.d.ts +30 -50
- package/dist/schema/schema.d.ts.map +1 -1
- package/dist/store/folder-store.d.ts.map +1 -1
- package/dist/store/map-row.d.ts +2 -8
- package/dist/store/map-row.d.ts.map +1 -1
- package/dist/store/object-store.d.ts.map +1 -1
- package/package.json +8 -26
- package/dist/drizzle/mysql.d.ts +0 -1057
- package/dist/drizzle/mysql.d.ts.map +0 -1
- package/dist/drizzle/mysql.js +0 -120
- package/dist/drizzle/mysql.js.map +0 -1
- package/dist/drizzle/pg.d.ts +0 -994
- package/dist/drizzle/pg.d.ts.map +0 -1
- package/dist/drizzle/pg.js +0 -104
- package/dist/drizzle/pg.js.map +0 -1
- package/dist/drizzle/shared.d.ts +0 -7
- package/dist/drizzle/shared.d.ts.map +0 -1
- package/dist/drizzle/sqlite.d.ts +0 -1056
- package/dist/drizzle/sqlite.d.ts.map +0 -1
- package/dist/drizzle/sqlite.js +0 -107
- package/dist/drizzle/sqlite.js.map +0 -1
- package/prisma/dimah-s3.prisma +0 -81
- package/sql/mysql.sql +0 -60
- package/sql/pg.sql +0 -53
- package/sql/sqlite.sql +0 -55
- package/src/drizzle/mysql.ts +0 -175
- package/src/drizzle/pg.ts +0 -146
- package/src/drizzle/sqlite.ts +0 -150
package/dist/index.js
CHANGED
|
@@ -7,109 +7,79 @@ import * as z from 'zod';
|
|
|
7
7
|
import { AbortMultipartUploadCommand, HeadObjectCommand } from '@aws-sdk/client-s3';
|
|
8
8
|
|
|
9
9
|
// src/fuma-db.ts
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
var BINARY = { mysql: "utf8mb4_bin" };
|
|
11
|
+
var TEXT = { mysql: "utf8mb4_unicode_ci" };
|
|
12
|
+
var LONG_PREFIX = 512;
|
|
13
|
+
function string(name, length = 255) {
|
|
14
|
+
return column(name, `varchar(${length})`).collate(BINARY);
|
|
12
15
|
}
|
|
13
16
|
var storageObject = table("storage_object", {
|
|
14
|
-
id: idColumn("id", "varchar(255)").defaultTo$("auto"),
|
|
17
|
+
id: idColumn("id", "varchar(255)").collate(BINARY).defaultTo$("auto"),
|
|
15
18
|
/** Owner, for example `user:123` or `org:acme`. */
|
|
16
|
-
scope:
|
|
17
|
-
bucket:
|
|
18
|
-
key:
|
|
19
|
+
scope: string("scope"),
|
|
20
|
+
bucket: string("bucket"),
|
|
21
|
+
key: string("key", 1024),
|
|
19
22
|
/** Named dimah-s3 route that created the object. */
|
|
20
|
-
route:
|
|
23
|
+
route: string("route"),
|
|
21
24
|
/** Folder that holds the object. `null` is the root. */
|
|
22
|
-
folderId:
|
|
23
|
-
filename: column("filename", "
|
|
24
|
-
contentType:
|
|
25
|
+
folderId: string("folder_id").nullable(),
|
|
26
|
+
filename: column("filename", "varchar(255)").collate(TEXT),
|
|
27
|
+
contentType: string("content_type").nullable(),
|
|
25
28
|
/** Verified size from HeadObject, set on confirm. */
|
|
26
|
-
size:
|
|
29
|
+
size: column("size", "bigint").nullable(),
|
|
27
30
|
/** Size the client declared before confirm. Quota counts it while pending. */
|
|
28
|
-
declaredSize:
|
|
29
|
-
eTag:
|
|
30
|
-
status:
|
|
31
|
+
declaredSize: column("declared_size", "bigint").nullable(),
|
|
32
|
+
eTag: string("e_tag").nullable(),
|
|
33
|
+
status: string("status", 16),
|
|
31
34
|
/** S3 user metadata of the verified object. */
|
|
32
35
|
s3Metadata: column("s3_metadata", "json").nullable(),
|
|
33
36
|
/** App attributes, validated by the plugin's `attributes.schema`. */
|
|
34
37
|
attributes: column("attributes", "json").nullable(),
|
|
35
|
-
acl:
|
|
38
|
+
acl: string("acl").nullable(),
|
|
36
39
|
/** Multipart upload ID while the row is pending. */
|
|
37
|
-
uploadId: column("upload_id", "string").nullable(),
|
|
40
|
+
uploadId: column("upload_id", "string").collate(BINARY).nullable(),
|
|
38
41
|
/** Token of the upload ticket that wrote the row. Confirm and purge match it. */
|
|
39
|
-
uploadToken:
|
|
42
|
+
uploadToken: string("upload_token", 64).nullable(),
|
|
40
43
|
/** Confirm deadline of a pending row (the upload ticket's expiry). */
|
|
41
44
|
expiresAt: column("expires_at", "timestamp").nullable(),
|
|
42
45
|
confirmedAt: column("confirmed_at", "timestamp").nullable(),
|
|
43
46
|
createdAt: column("created_at", "timestamp").defaultTo$("now"),
|
|
44
47
|
updatedAt: column("updated_at", "timestamp").defaultTo$("now"),
|
|
45
48
|
deletedAt: column("deleted_at", "timestamp").nullable()
|
|
46
|
-
}).unique("storage_object_bucket_key_uk", ["bucket", "key"]
|
|
49
|
+
}).unique("storage_object_bucket_key_uk", ["bucket", "key"], {
|
|
50
|
+
length: { key: LONG_PREFIX }
|
|
51
|
+
}).index("storage_object_scope_folder_idx", [
|
|
52
|
+
"scope",
|
|
53
|
+
"status",
|
|
54
|
+
"folderId",
|
|
55
|
+
"createdAt"
|
|
56
|
+
]).index("storage_object_scope_updated_idx", ["scope", "status", "updatedAt"]).index("storage_object_scope_filename_idx", ["scope", "status", "filename"]).index("storage_object_scope_size_idx", ["scope", "status", "size"]).index("storage_object_status_expires_idx", ["status", "expiresAt"]);
|
|
47
57
|
var storageFolder = table("storage_folder", {
|
|
48
|
-
id: idColumn("id", "varchar(255)").defaultTo$("auto"),
|
|
49
|
-
scope:
|
|
58
|
+
id: idColumn("id", "varchar(255)").collate(BINARY).defaultTo$("auto"),
|
|
59
|
+
scope: string("scope"),
|
|
50
60
|
/** Id of the containing folder. `""` is the root. */
|
|
51
|
-
parentId:
|
|
61
|
+
parentId: string("parent_id").defaultTo(""),
|
|
52
62
|
/** Last segment of `path`. */
|
|
53
|
-
name:
|
|
63
|
+
name: string("name"),
|
|
54
64
|
/** Full folder path. */
|
|
55
|
-
path:
|
|
65
|
+
path: string("path", 1024),
|
|
56
66
|
createdAt: column("created_at", "timestamp").defaultTo$("now"),
|
|
57
67
|
updatedAt: column("updated_at", "timestamp").defaultTo$("now")
|
|
58
|
-
}).unique("storage_folder_scope_path_uk", ["scope", "path"]
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
name: "storage_object_scope_folder_idx",
|
|
62
|
-
table: "storage_object",
|
|
63
|
-
columns: ["scope", "status", "folder_id", "created_at"]
|
|
64
|
-
},
|
|
65
|
-
{
|
|
66
|
-
name: "storage_object_scope_updated_idx",
|
|
67
|
-
table: "storage_object",
|
|
68
|
-
columns: ["scope", "status", "updated_at"]
|
|
69
|
-
},
|
|
70
|
-
{
|
|
71
|
-
name: "storage_object_scope_filename_idx",
|
|
72
|
-
table: "storage_object",
|
|
73
|
-
columns: ["scope", "status", "filename"]
|
|
74
|
-
},
|
|
75
|
-
{
|
|
76
|
-
name: "storage_object_scope_size_idx",
|
|
77
|
-
table: "storage_object",
|
|
78
|
-
columns: ["scope", "status", "size"]
|
|
79
|
-
},
|
|
80
|
-
{
|
|
81
|
-
name: "storage_object_status_expires_idx",
|
|
82
|
-
table: "storage_object",
|
|
83
|
-
columns: ["status", "expires_at"]
|
|
84
|
-
}
|
|
85
|
-
];
|
|
86
|
-
var custom = (sql) => ({ type: "custom", sql });
|
|
87
|
-
var PREDECESSOR_VERSION = "0.0.1";
|
|
88
|
-
var predecessor = schema({
|
|
89
|
-
version: PREDECESSOR_VERSION,
|
|
90
|
-
tables: {}
|
|
91
|
-
});
|
|
68
|
+
}).unique("storage_folder_scope_path_uk", ["scope", "path"], {
|
|
69
|
+
length: { path: LONG_PREFIX }
|
|
70
|
+
}).unique("storage_folder_scope_parent_name_uk", ["scope", "parentId", "name"]);
|
|
92
71
|
var dbSchema = schema({
|
|
93
72
|
version: "2.1.0",
|
|
94
73
|
tables: {
|
|
95
74
|
storageObject,
|
|
96
75
|
storageFolder
|
|
97
|
-
},
|
|
98
|
-
async up({ auto }) {
|
|
99
|
-
const indexes = schemaIndexes.map((index) => {
|
|
100
|
-
const columns = index.columns.map((name) => `"${name}"`).join(", ");
|
|
101
|
-
return custom(
|
|
102
|
-
`CREATE INDEX IF NOT EXISTS "${index.name}" ON "${index.table}" (${columns})`
|
|
103
|
-
);
|
|
104
|
-
});
|
|
105
|
-
return [...await auto(), ...indexes];
|
|
106
76
|
}
|
|
107
77
|
});
|
|
108
78
|
|
|
109
79
|
// src/fuma-db.ts
|
|
110
80
|
var DimahS3DB = fumadb({
|
|
111
81
|
namespace: "dimah_s3",
|
|
112
|
-
schemas: [
|
|
82
|
+
schemas: [dbSchema]
|
|
113
83
|
});
|
|
114
84
|
var DB_SCHEMA_VERSION = dbSchema.version;
|
|
115
85
|
var FOLDER_PATH_MAX_LENGTH = 1024;
|
|
@@ -304,6 +274,12 @@ function filterConditions(b, filter, now) {
|
|
|
304
274
|
if (filter.search) parts.push(b("filename", "contains", filter.search));
|
|
305
275
|
return parts;
|
|
306
276
|
}
|
|
277
|
+
function toByteCount(value) {
|
|
278
|
+
return value == null ? null : BigInt(value);
|
|
279
|
+
}
|
|
280
|
+
function toColumnValue(value) {
|
|
281
|
+
return typeof value === "number" ? BigInt(value) : value;
|
|
282
|
+
}
|
|
307
283
|
function createObjectStore(getOrm) {
|
|
308
284
|
const map = mapStorageObjectRow;
|
|
309
285
|
const find = async (ref) => {
|
|
@@ -348,13 +324,11 @@ function createObjectStore(getOrm) {
|
|
|
348
324
|
} else {
|
|
349
325
|
if (nullable) parts.push(b.isNotNull(field));
|
|
350
326
|
if (position && position.value !== null) {
|
|
327
|
+
const value = toColumnValue(position.value);
|
|
351
328
|
parts.push(
|
|
352
329
|
b.or(
|
|
353
|
-
b(field, after,
|
|
354
|
-
b.and(
|
|
355
|
-
b(field, "=", position.value),
|
|
356
|
-
b("id", after, position.id)
|
|
357
|
-
)
|
|
330
|
+
b(field, after, value),
|
|
331
|
+
b.and(b(field, "=", value), b("id", after, position.id))
|
|
358
332
|
)
|
|
359
333
|
);
|
|
360
334
|
}
|
|
@@ -439,7 +413,7 @@ function createObjectStore(getOrm) {
|
|
|
439
413
|
const upload = {
|
|
440
414
|
uploadId: input.uploadId ?? null,
|
|
441
415
|
uploadToken: input.uploadToken,
|
|
442
|
-
declaredSize: input.declaredSize
|
|
416
|
+
declaredSize: toByteCount(input.declaredSize),
|
|
443
417
|
expiresAt: input.expiresAt
|
|
444
418
|
};
|
|
445
419
|
const now = /* @__PURE__ */ new Date();
|
|
@@ -501,7 +475,7 @@ function createObjectStore(getOrm) {
|
|
|
501
475
|
where: (b) => b.and(byUpload(b, input), uploading(b)),
|
|
502
476
|
set: {
|
|
503
477
|
status: "active",
|
|
504
|
-
size: input.size,
|
|
478
|
+
size: BigInt(input.size),
|
|
505
479
|
declaredSize: null,
|
|
506
480
|
eTag: input.eTag ?? null,
|
|
507
481
|
...input.contentType !== void 0 && {
|
|
@@ -645,11 +619,17 @@ function createObjectStore(getOrm) {
|
|
|
645
619
|
// src/store/folder-store.ts
|
|
646
620
|
var DEFAULT_FOLDER_CHILDREN_LIMIT = 1e3;
|
|
647
621
|
function isUniqueViolation(error) {
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
622
|
+
for (let current = error; typeof current === "object" && current !== null; ) {
|
|
623
|
+
const code = "code" in current ? String(current.code) : "";
|
|
624
|
+
if (code === "23505" || code === "ER_DUP_ENTRY" || code === "P2002") {
|
|
625
|
+
return true;
|
|
626
|
+
}
|
|
627
|
+
if (current instanceof Error && /unique/i.test(current.message)) {
|
|
628
|
+
return true;
|
|
629
|
+
}
|
|
630
|
+
current = "cause" in current ? current.cause : void 0;
|
|
631
|
+
}
|
|
632
|
+
return false;
|
|
653
633
|
}
|
|
654
634
|
function storedParent(parentId) {
|
|
655
635
|
return parentId ?? "";
|