@paroicms/server-database-media-storage 1.12.2 → 1.13.0
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/db-init/db-init.d.ts +3 -3
- package/dist/db-init/db-init.js +5 -5
- package/dist/db-init/db-init.js.map +1 -1
- package/dist/db-init/ddl-migration.d.ts +3 -3
- package/dist/db-init/ddl-migration.js +2 -2
- package/dist/db-init/ddl-migration.js.map +1 -1
- package/dist/media-storage-context.d.ts +2 -2
- package/dist/media-storage-context.js +3 -3
- package/dist/media-storage-context.js.map +1 -1
- package/dist/media-storage.d.ts +2 -2
- package/dist/media.queries.js +1 -1
- package/package.json +7 -7
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AppLogger } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { DataSource } from "typeorm";
|
|
3
|
-
export declare function createOrOpenMediasConnection({ sqliteFile, canCreate,
|
|
3
|
+
export declare function createOrOpenMediasConnection({ sqliteFile, canCreate, logger, }: {
|
|
4
4
|
sqliteFile: string;
|
|
5
5
|
canCreate: boolean;
|
|
6
|
-
|
|
6
|
+
logger: AppLogger;
|
|
7
7
|
}): Promise<{
|
|
8
8
|
cn: DataSource;
|
|
9
9
|
logNextQuery: (count?: number) => void;
|
package/dist/db-init/db-init.js
CHANGED
|
@@ -5,8 +5,8 @@ const internal_server_lib_1 = require("@paroicms/internal-server-lib");
|
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const context_1 = require("../context");
|
|
7
7
|
const ddl_migration_1 = require("./ddl-migration");
|
|
8
|
-
async function createOrOpenMediasConnection({ sqliteFile, canCreate,
|
|
9
|
-
const { logNextQuery, typeOrmLogger } = (0, internal_server_lib_1.createSqlLogger)({
|
|
8
|
+
async function createOrOpenMediasConnection({ sqliteFile, canCreate, logger, }) {
|
|
9
|
+
const { logNextQuery, typeOrmLogger } = (0, internal_server_lib_1.createSqlLogger)({ logger, dbSchemaName: ddl_migration_1.dbSchemaName });
|
|
10
10
|
const { cn } = await (0, internal_server_lib_1.createOrOpenSqliteConnection)({
|
|
11
11
|
canCreate,
|
|
12
12
|
dbSchemaName: ddl_migration_1.dbSchemaName,
|
|
@@ -14,8 +14,8 @@ async function createOrOpenMediasConnection({ sqliteFile, canCreate, appLog, })
|
|
|
14
14
|
ddlFile: (0, node_path_1.join)(context_1.packageDir, "ddl", "medias.ddl.sql"),
|
|
15
15
|
migrateDb,
|
|
16
16
|
entities: [`${context_1.packageDir}/dist/**/*.model.js`],
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
typeOrmLogger,
|
|
18
|
+
logger,
|
|
19
19
|
});
|
|
20
20
|
async function migrateDb(cn) {
|
|
21
21
|
const dbVersion = await (0, internal_server_lib_1.getMetadataDbSchemaVersion)(cn, { dbSchemaName: ddl_migration_1.dbSchemaName });
|
|
@@ -27,7 +27,7 @@ async function createOrOpenMediasConnection({ sqliteFile, canCreate, appLog, })
|
|
|
27
27
|
}
|
|
28
28
|
await (0, ddl_migration_1.migrateMediasDb)(cn, {
|
|
29
29
|
fromVersion: dbVersion,
|
|
30
|
-
|
|
30
|
+
logger,
|
|
31
31
|
});
|
|
32
32
|
return {
|
|
33
33
|
migrated: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;AAYA,oEAsCC;AAlDD,uEAKuC;AAEvC,yCAAiC;AAEjC,wCAAwC;AACxC,mDAAwF;AAEjF,KAAK,UAAU,4BAA4B,CAAC,EACjD,UAAU,EACV,SAAS,EACT,MAAM,
|
|
1
|
+
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;AAYA,oEAsCC;AAlDD,uEAKuC;AAEvC,yCAAiC;AAEjC,wCAAwC;AACxC,mDAAwF;AAEjF,KAAK,UAAU,4BAA4B,CAAC,EACjD,UAAU,EACV,SAAS,EACT,MAAM,GACwD;IAC9D,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,qCAAe,EAAC,EAAE,MAAM,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;IAElF,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,kDAA4B,EAAC;QAChD,SAAS;QACT,YAAY,EAAZ,4BAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAA,gBAAI,EAAC,oBAAU,EAAE,KAAK,EAAE,gBAAgB,CAAC;QAClD,SAAS;QACT,QAAQ,EAAE,CAAC,GAAG,oBAAU,qBAAqB,CAAC;QAC9C,aAAa;QACb,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,gDAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,sCAAsB,EAAE,CAAC;YACzC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,IAAA,+BAAe,EAAC,EAAE,EAAE;YACxB,WAAW,EAAE,SAAS;YACtB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,sCAAsB;SACtC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AppLogger } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { DataSource } from "typeorm";
|
|
3
3
|
export declare const dbSchemaName = "medias";
|
|
4
4
|
export declare const currentDbSchemaVersion = 7;
|
|
5
|
-
export declare function migrateMediasDb(cn: DataSource, { fromVersion,
|
|
5
|
+
export declare function migrateMediasDb(cn: DataSource, { fromVersion, logger }: {
|
|
6
6
|
fromVersion: number;
|
|
7
|
-
|
|
7
|
+
logger: AppLogger;
|
|
8
8
|
}): Promise<void>;
|
|
@@ -6,7 +6,7 @@ const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
|
6
6
|
const internal_server_lib_1 = require("@paroicms/internal-server-lib");
|
|
7
7
|
exports.dbSchemaName = "medias";
|
|
8
8
|
exports.currentDbSchemaVersion = 7;
|
|
9
|
-
async function migrateMediasDb(cn, { fromVersion,
|
|
9
|
+
async function migrateMediasDb(cn, { fromVersion, logger }) {
|
|
10
10
|
const toVersion = exports.currentDbSchemaVersion;
|
|
11
11
|
let currentVersion = fromVersion;
|
|
12
12
|
if (currentVersion === 3) {
|
|
@@ -52,7 +52,7 @@ where uid = '${uid}'`, [originalName]);
|
|
|
52
52
|
if (currentVersion !== toVersion) {
|
|
53
53
|
throw new Error(`version of ${exports.dbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
logger.info(`${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
|
|
56
56
|
}
|
|
57
57
|
function removeExtensionFromFileName(fileName) {
|
|
58
58
|
const i = fileName.lastIndexOf(".");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAQA,0CAiEC;AAzED,oEAA4E;AAC5E,uEAAoG;AAIvF,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAEjC,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AppLogger } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { DataSource } from "typeorm";
|
|
3
3
|
import type { MediaStorageOptions } from "./media-storage";
|
|
4
4
|
export declare class MediaStorageContext {
|
|
5
5
|
#private;
|
|
6
6
|
status: "ready" | "destroyed";
|
|
7
7
|
canCreate: boolean;
|
|
8
|
-
|
|
8
|
+
logger: AppLogger;
|
|
9
9
|
logNextQuery: (count?: number | undefined) => void;
|
|
10
10
|
asyncQueue: <T extends () => Promise<any>>(task: T) => ReturnType<T>;
|
|
11
11
|
constructor(options: MediaStorageOptions);
|
|
@@ -6,21 +6,21 @@ const db_init_1 = require("./db-init/db-init");
|
|
|
6
6
|
class MediaStorageContext {
|
|
7
7
|
status = "ready";
|
|
8
8
|
canCreate;
|
|
9
|
-
|
|
9
|
+
logger;
|
|
10
10
|
logNextQuery;
|
|
11
11
|
asyncQueue = (0, async_lib_1.createAsyncQueue)();
|
|
12
12
|
#dbFileStorage;
|
|
13
13
|
#cn;
|
|
14
14
|
constructor(options) {
|
|
15
15
|
this.canCreate = options.canCreate;
|
|
16
|
-
this.
|
|
16
|
+
this.logger = options.logger;
|
|
17
17
|
this.#dbFileStorage = options.storage.file;
|
|
18
18
|
this.logNextQuery = () => { };
|
|
19
19
|
}
|
|
20
20
|
async init() {
|
|
21
21
|
const { cn, logNextQuery } = await (0, db_init_1.createOrOpenMediasConnection)({
|
|
22
22
|
sqliteFile: this.#dbFileStorage,
|
|
23
|
-
|
|
23
|
+
logger: this.logger,
|
|
24
24
|
canCreate: this.canCreate,
|
|
25
25
|
});
|
|
26
26
|
this.logNextQuery = logNextQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-storage-context.js","sourceRoot":"","sources":["../src/media-storage-context.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAGpD,+CAAiE;AAGjE,MAAa,mBAAmB;IAC9B,MAAM,GAA0B,OAAO,CAAC;IACxC,SAAS,CAAU;IACnB,MAAM,
|
|
1
|
+
{"version":3,"file":"media-storage-context.js","sourceRoot":"","sources":["../src/media-storage-context.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAGpD,+CAAiE;AAGjE,MAAa,mBAAmB;IAC9B,MAAM,GAA0B,OAAO,CAAC;IACxC,SAAS,CAAU;IACnB,MAAM,CAAY;IAClB,YAAY,CAAuC;IACnD,UAAU,GAAG,IAAA,4BAAgB,GAAE,CAAC;IAChC,cAAc,CAAS;IAEvB,GAAG,CAAc;IAEjB,YAAY,OAA4B;QACtC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sCAA4B,EAAC;YAC9D,UAAU,EAAE,IAAI,CAAC,cAAc;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAClD,CAAC;IAED,EAAE;QACA,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;CACF;AAhCD,kDAgCC"}
|
package/dist/media-storage.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AppLogger } from "@paroicms/public-server-lib";
|
|
2
2
|
import type { Image, ImageWithBinary, Media, MediaWithBinary } from "./data-types";
|
|
3
3
|
import type { NewMediaWithHandle, ReorderMediasInput } from "./media-storage-types";
|
|
4
4
|
export interface MediaStorageOptions {
|
|
5
5
|
canCreate: boolean;
|
|
6
6
|
storage: MediaStorageConf;
|
|
7
|
-
|
|
7
|
+
logger: AppLogger;
|
|
8
8
|
}
|
|
9
9
|
export interface MediaStorageConf {
|
|
10
10
|
type: "sqlite";
|
package/dist/media.queries.js
CHANGED
|
@@ -235,7 +235,7 @@ async function reorderMedias(ctx, { mediaUids: uids, handle }) {
|
|
|
235
235
|
for (const uid of uids) {
|
|
236
236
|
const media = medias.find((item) => item.uid === uid);
|
|
237
237
|
if (!media) {
|
|
238
|
-
ctx.
|
|
238
|
+
ctx.logger.warn(`[reorder medias] skip missing media '${uid}' ('${handle}')`);
|
|
239
239
|
continue;
|
|
240
240
|
}
|
|
241
241
|
orderMedias.push({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server-database-media-storage",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.13.0",
|
|
4
4
|
"description": "A library to make back-end for media galleries.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"paroicms",
|
|
@@ -26,17 +26,17 @@
|
|
|
26
26
|
"dev": "tsc --watch --preserveWatchOutput"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@types/node": "~
|
|
29
|
+
"@types/node": "~22.10.7",
|
|
30
30
|
"rimraf": "~6.0.1",
|
|
31
|
-
"typescript": "~5.7.
|
|
31
|
+
"typescript": "~5.7.3"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@paroi/async-lib": "~0.3.1",
|
|
35
35
|
"@paroi/data-formatters-lib": "~0.4.0",
|
|
36
|
-
"@paroicms/internal-anywhere-lib": "1.
|
|
37
|
-
"@paroicms/internal-server-lib": "1.
|
|
38
|
-
"@paroicms/public-server-lib": "0.
|
|
39
|
-
"@paroicms/public-anywhere-lib": "0.
|
|
36
|
+
"@paroicms/internal-anywhere-lib": "1.21.0",
|
|
37
|
+
"@paroicms/internal-server-lib": "1.10.0",
|
|
38
|
+
"@paroicms/public-server-lib": "0.22.0",
|
|
39
|
+
"@paroicms/public-anywhere-lib": "0.14.0"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
42
|
"typeorm": "0.3"
|