@steedos/server 3.0.0-beta.58 → 3.0.0-beta.60

package/dist/index.d.ts

@@ -2,6 +2,8 @@ import { AppController } from "./app.controller";
 import { AppMoleculer } from "./app.moleculer";
 import { AppGateway } from "./app.gateway";
 import { InstanceFileController } from "./instance_files/file.controller";
+import { FileService } from "./instance_files/file.service";
+import { FileMoleculer } from "./instance_files/file.moleculer";
 export declare const modulesConfig: {
     moleculer: (config: any) => any;
 };
@@ -9,4 +11,4 @@ export declare const beforeServerStart: ({ app }: {
     app: any;
 }) => void;
 export declare const controllers: (typeof AppController | typeof InstanceFileController)[];
-export declare const providers: (typeof AppGateway | typeof AppMoleculer)[];
+export declare const providers: (typeof AppGateway | typeof AppMoleculer | typeof FileService | typeof FileMoleculer)[];

package/dist/index.js

@@ -11,6 +11,8 @@ const app_gateway_1 = require("./app.gateway");
 const express_1 = __importDefault(require("express"));
 const config_1 = require("./config");
 const file_controller_1 = require("./instance_files/file.controller");
+const file_service_1 = require("./instance_files/file.service");
+const file_moleculer_1 = require("./instance_files/file.moleculer");
 const steedosConfig = (0, config_1.getSteedosConfigs)();
 exports.modulesConfig = {
     moleculer: (config) => {
@@ -59,5 +61,5 @@ const beforeServerStart = ({ app }) => {
 };
 exports.beforeServerStart = beforeServerStart;
 exports.controllers = [app_controller_1.AppController, file_controller_1.InstanceFileController];
-exports.providers = [app_moleculer_1.AppMoleculer, app_gateway_1.AppGateway];
+exports.providers = [app_moleculer_1.AppMoleculer, app_gateway_1.AppGateway, file_service_1.FileService, file_moleculer_1.FileMoleculer];
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAkC;AAClC,qDAAiD;AACjD,mDAA+C;AAC/C,+CAA2C;AAC3C,sDAA8B;AAE9B,qCAAkE;AAClE,sEAA0E;AAE1E,MAAM,aAAa,GAAG,IAAA,0BAAiB,GAAE,CAAC;AAE7B,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;QACpB,qDACK,MAAM,GACN,IAAA,4BAAmB,GAAE,GACrB,aAAa,EAChB;IACJ,CAAC;CACF,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;IAC3C,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;QACxC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE3B,MAAM,UAAU,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE,CAAC;IAEtD,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAG1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAE1E,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC;IAG1E,IAAI,iBAAiB,EAAE,CAAC;QACtB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QACpD,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACzC,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG;YACrB,SAAS;YACT,SAAS;YACT,QAAQ;YACR,GAAG;YACH,eAAe;YACf,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,gBAAgB;YAChB,OAAO;YACP,gBAAgB;YAChB,MAAM;YACN,aAAa;YACb,0BAA0B;YAC1B,yBAAyB;YACzB,0CAA0C;YAC1C,2DAA2D;YAC3D,wCAAwC;YACxC,+BAA+B;SAChC,CAAC;QACF,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1C,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAhDW,QAAA,iBAAiB,qBAgD5B;AAMW,QAAA,WAAW,GAAG,CAAC,8BAAa,EAAE,wCAAsB,CAAC,CAAC;AAEtD,QAAA,SAAS,GAAG,CAAC,4BAAY,EAAE,wBAAU,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAkC;AAClC,qDAAiD;AACjD,mDAA+C;AAC/C,+CAA2C;AAC3C,sDAA8B;AAE9B,qCAAkE;AAClE,sEAA0E;AAC1E,gEAA4D;AAC5D,oEAAgE;AAEhE,MAAM,aAAa,GAAG,IAAA,0BAAiB,GAAE,CAAC;AAE7B,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;QACpB,qDACK,MAAM,GACN,IAAA,4BAAmB,GAAE,GACrB,aAAa,EAChB;IACJ,CAAC;CACF,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;IAC3C,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;QACxC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE3B,MAAM,UAAU,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE,CAAC;IAEtD,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAG1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAE1E,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC;IAG1E,IAAI,iBAAiB,EAAE,CAAC;QACtB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QACpD,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACzC,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG;YACrB,SAAS;YACT,SAAS;YACT,QAAQ;YACR,GAAG;YACH,eAAe;YACf,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,gBAAgB;YAChB,OAAO;YACP,gBAAgB;YAChB,MAAM;YACN,aAAa;YACb,0BAA0B;YAC1B,yBAAyB;YACzB,0CAA0C;YAC1C,2DAA2D;YAC3D,wCAAwC;YACxC,+BAA+B;SAChC,CAAC;QACF,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1C,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAhDW,QAAA,iBAAiB,qBAgD5B;AAMW,QAAA,WAAW,GAAG,CAAC,8BAAa,EAAE,wCAAsB,CAAC,CAAC;AAEtD,QAAA,SAAS,GAAG,CAAC,4BAAY,EAAE,wBAAU,EAAE,0BAAW,EAAE,8BAAa,CAAC,CAAC"}

package/dist/instance_files/file.controller.d.ts

@@ -1,13 +1,14 @@
 import { MongodbService } from "@builder6/core";
-import { FilesService } from "@builder6/files";
 import { Request } from "express";
+import { FileService } from "./file.service";
 export declare class InstanceFileController {
-    private filesService;
+    private fileService;
     private mongodbService;
-    constructor(filesService: FilesService, mongodbService: MongodbService);
+    constructor(fileService: FileService, mongodbService: MongodbService);
     uploadFile(instanceId: string, req: Request, file: any): Promise<{
         version_id: any;
         size: any;
     }>;
+    copyFiles(): Promise<void>;
     private formatFileName;
 }

package/dist/instance_files/file.controller.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -57,98 +24,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceFileController = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@builder6/core");
-const files_1 = require("@builder6/files");
 const platform_express_1 = require("@nestjs/platform-express");
-const _ = __importStar(require("lodash"));
+const file_service_1 = require("./file.service");
 let InstanceFileController = class InstanceFileController {
-    constructor(filesService, mongodbService) {
-        this.filesService = filesService;
+    constructor(fileService, mongodbService) {
+        this.fileService = fileService;
         this.mongodbService = mongodbService;
     }
     uploadFile(instanceId, req, file) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 const userSession = req.user;
-                const userId = userSession["userId"];
-                const spaceId = userSession["spaceId"];
                 const fields = req.body;
-                const { approve, is_private, owner = userId, owner_name = userSession["name"], space = spaceId, upload_from, isAddVersion, parent, main, locked_by, locked_by_name, overwrite, } = fields;
-                const deny_ext = ((_a = process.env.STEEDOS_CFS_UPLOAD_DENY_EXT) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
-                const fileName = this.formatFileName(file.originalname, upload_from);
-                const name_split = fileName.split(".");
-                const extension = name_split.pop();
-                if (_.includes(deny_ext, extension)) {
-                    throw new common_1.BadRequestException(`禁止上传「${extension}」附件`);
-                }
-                const metadata = {
-                    owner,
-                    owner_name,
-                    space,
-                    instance: instanceId,
-                    approve,
-                    current: true,
-                    is_private: _.isBoolean(is_private)
-                        ? is_private
-                        : _.isString(is_private)
-                            ? is_private.toLowerCase() === "true"
-                            : false,
-                };
-                if (main === "true" || main === true) {
-                    metadata.main = true;
-                }
-                let parentId = "";
-                if (isAddVersion && parent) {
-                    parentId = parent;
-                }
-                let fileRecord;
-                if (parentId) {
-                    metadata.parent = parentId;
-                    if (locked_by && locked_by_name) {
-                        metadata.locked_by = locked_by;
-                        metadata.locked_by_name = locked_by_name;
-                    }
-                    const fileRecord = yield this.filesService.uploadFile("cfs.instances.filerecord", file, {}, {
-                        metadata: metadata,
-                    });
-                    if (fileRecord) {
-                        yield this.mongodbService.findOneAndUpdate("cfs.instances.filerecord", {
-                            "metadata.parent": parentId,
-                            "metadata.current": true,
-                        }, {
-                            $unset: {
-                                "metadata.current": "",
-                            },
-                        }, {});
-                        if ((overwrite === null || overwrite === void 0 ? void 0 : overwrite.toLowerCase()) === "true") {
-                            yield this.mongodbService.deleteMany("cfs.instances.filerecord", {
-                                "metadata.instance": instanceId,
-                                "metadata.parent": parentId,
-                                "metadata.owner": owner,
-                                "metadata.approve": approve,
-                                "metadata.current": {
-                                    $ne: true,
-                                },
-                            });
-                        }
-                    }
-                }
-                else {
-                    fileRecord = yield this.filesService.uploadFile("cfs.instances.filerecord", file, {}, {
-                        metadata: metadata,
-                    });
-                    yield this.mongodbService.findOneAndUpdateData("cfs.instances.filerecord", { _id: fileRecord._id }, { "metadata.parent": fileRecord._id });
-                }
-                return {
-                    version_id: fileRecord._id,
-                    size: file.size,
-                };
+                return yield this.fileService.uploadFile(instanceId, file, fields, userSession);
             }
             catch (error) {
                 throw error;
             }
         });
     }
+    copyFiles() {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
     formatFileName(originalName, uploadFrom) {
         if (uploadFrom === "mobile") {
             return originalName.replace(/ /g, "_");
@@ -170,7 +67,7 @@ __decorate([
 ], InstanceFileController.prototype, "uploadFile", null);
 exports.InstanceFileController = InstanceFileController = __decorate([
     (0, common_1.Controller)("/api"),
-    __metadata("design:paramtypes", [files_1.FilesService,
+    __metadata("design:paramtypes", [file_service_1.FileService,
         core_1.MongodbService])
 ], InstanceFileController);
 //# sourceMappingURL=file.controller.js.map

package/dist/instance_files/file.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.controller.js","sourceRoot":"","sources":["../../src/instance_files/file.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.controller.js","sourceRoot":"","sources":["../../src/instance_files/file.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,yCAA2D;AAC3D,+DAA2D;AAE3D,iDAA6C;AAItC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACU,WAAwB,EACxB,cAA8B;QAD9B,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;IACrC,CAAC;IAME,UAAU,CACO,UAAkB,EAChC,GAAY,EACH,IAAS;;YAEzB,IAAI,CAAC;gBACH,MAAM,WAAW,GAAI,GAAW,CAAC,IAAI,CAAC;gBAGtC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC;gBAExB,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CACtC,UAAU,EACV,IAAI,EACJ,MAAM,EACN,WAAW,CACZ,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;KAAA;IAEK,SAAS;8DAAI,CAAC;KAAA;IAEZ,cAAc,CAAC,YAAoB,EAAE,UAAmB;QAG9D,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;CACF,CAAA;AA1CY,wDAAsB;AAU3B;IAHL,IAAA,kBAAS,EAAC,gBAAS,CAAC;IACpB,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;IACxC,IAAA,aAAI,EAAC,2BAA2B,CAAC;IAE/B,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,qBAAY,GAAE,CAAA;;;;wDAiBhB;iCA9BU,sBAAsB;IADlC,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAGM,0BAAW;QACR,qBAAc;GAH7B,sBAAsB,CA0ClC"}

package/dist/instance_files/file.moleculer.d.ts

@@ -0,0 +1,7 @@
+import { Service, ServiceBroker } from "moleculer";
+import { FileService } from "./file.service";
+export declare class FileMoleculer extends Service {
+    private fileService;
+    started: Boolean;
+    constructor(broker: ServiceBroker, fileService: FileService);
+}

package/dist/instance_files/file.moleculer.js

@@ -0,0 +1,55 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileMoleculer = void 0;
+const moleculer_1 = require("moleculer");
+const common_1 = require("@nestjs/common");
+const moleculer_2 = require("@builder6/moleculer");
+const file_service_1 = require("./file.service");
+let FileMoleculer = class FileMoleculer extends moleculer_1.Service {
+    constructor(broker, fileService) {
+        super(broker);
+        this.fileService = fileService;
+        this.started = false;
+        this.parseServiceSchema({
+            namespace: "steedos",
+            name: "instanceFiles",
+            settings: {},
+            actions: {
+                copyInstanceFiles: (ctx) => __awaiter(this, void 0, void 0, function* () {
+                    const { sourceInstanceId, targetInstanceId, targetInstanceApproveId, userSession, options, } = ctx.params;
+                    return yield fileService.copyInstanceFiles(sourceInstanceId, targetInstanceId, targetInstanceApproveId, userSession, options);
+                }),
+            },
+            events: {},
+        });
+    }
+};
+exports.FileMoleculer = FileMoleculer;
+exports.FileMoleculer = FileMoleculer = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, moleculer_2.InjectBroker)()),
+    __metadata("design:paramtypes", [moleculer_1.ServiceBroker,
+        file_service_1.FileService])
+], FileMoleculer);
+//# sourceMappingURL=file.moleculer.js.map

package/dist/instance_files/file.moleculer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file.moleculer.js","sourceRoot":"","sources":["../../src/instance_files/file.moleculer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4D;AAC5D,2CAAoD;AACpD,mDAAmD;AACnD,iDAA6C;AAGtC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,mBAAO;IAExC,YACkB,MAAqB,EAC7B,WAAwB;QAEhC,KAAK,CAAC,MAAM,CAAC,CAAC;QAFN,gBAAW,GAAX,WAAW,CAAa;QAHlC,YAAO,GAAY,KAAK,CAAC;QAOvB,IAAI,CAAC,kBAAkB,CAAC;YACtB,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE;gBACP,iBAAiB,EAAE,CAAO,GAAG,EAAE,EAAE;oBAC/B,MAAM,EACJ,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,WAAW,EACX,OAAO,GACR,GAAG,GAAG,CAAC,MAAM,CAAC;oBACf,OAAO,MAAM,WAAW,CAAC,iBAAiB,CACxC,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,WAAW,EACX,OAAO,CACR,CAAC;gBACJ,CAAC,CAAA;aACF;YACD,MAAM,EAAE,EAAE;SACX,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjCY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCAAS,yBAAa;QAChB,0BAAW;GAJvB,aAAa,CAiCzB"}

package/dist/instance_files/file.service.d.ts

@@ -0,0 +1,17 @@
+import { MongodbService } from "@builder6/core";
+import { FilesService } from "@builder6/files";
+export declare class FileService {
+    private filesService;
+    private mongodbService;
+    constructor(filesService: FilesService, mongodbService: MongodbService);
+    private readonly logger;
+    uploadFile(instanceId: any, file: any, fields: any, userSession: any): Promise<{
+        version_id: any;
+        size: any;
+    }>;
+    copyInstanceFiles(sourceInstanceId: any, targetInstanceId: any, targetInstanceApproveId: any, userSession: any, { can_edit_main_attach, can_edit_normal_attach }: {
+        can_edit_main_attach: any;
+        can_edit_normal_attach: any;
+    }): Promise<void>;
+    private formatFileName;
+}

package/dist/instance_files/file.service.js

@@ -0,0 +1,239 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var FileService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileService = void 0;
+const common_1 = require("@nestjs/common");
+const _ = __importStar(require("lodash"));
+const core_1 = require("@builder6/core");
+const files_1 = require("@builder6/files");
+const COLLECTION_NAME = "cfs.instances.filerecord";
+const stream_1 = require("stream");
+function streamToMulterFile(stream, originalname, mimetype) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, stream_2, stream_2_1;
+        var _b, e_1, _c, _d;
+        const chunks = [];
+        try {
+            for (_a = true, stream_2 = __asyncValues(stream); stream_2_1 = yield stream_2.next(), _b = stream_2_1.done, !_b; _a = true) {
+                _d = stream_2_1.value;
+                _a = false;
+                const chunk = _d;
+                chunks.push(chunk);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (!_a && !_b && (_c = stream_2.return)) yield _c.call(stream_2);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        const buffer = Buffer.concat(chunks);
+        const multerFile = {
+            fieldname: "file",
+            originalname,
+            encoding: "7bit",
+            mimetype,
+            buffer,
+            size: buffer.length,
+            stream: stream_1.Readable.from(buffer),
+            destination: "",
+            filename: originalname,
+            path: "",
+        };
+        return multerFile;
+    });
+}
+let FileService = FileService_1 = class FileService {
+    constructor(filesService, mongodbService) {
+        this.filesService = filesService;
+        this.mongodbService = mongodbService;
+        this.logger = new common_1.Logger(FileService_1.name);
+    }
+    uploadFile(instanceId, file, fields, userSession) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const userId = userSession["userId"];
+            const spaceId = userSession["spaceId"];
+            const { approve, is_private, owner = userId, owner_name = userSession["name"], space = spaceId, upload_from, isAddVersion, parent, main, locked_by, locked_by_name, overwrite, } = fields;
+            const deny_ext = ((_a = process.env.STEEDOS_CFS_UPLOAD_DENY_EXT) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
+            const fileName = this.formatFileName(file.originalname, upload_from);
+            const name_split = fileName.split(".");
+            const extension = name_split.pop();
+            if (_.includes(deny_ext, extension)) {
+                throw new common_1.BadRequestException(`禁止上传「${extension}」附件`);
+            }
+            const metadata = {
+                owner,
+                owner_name,
+                space,
+                instance: instanceId,
+                approve,
+                current: true,
+                is_private: _.isBoolean(is_private)
+                    ? is_private
+                    : _.isString(is_private)
+                        ? is_private.toLowerCase() === "true"
+                        : false,
+            };
+            if (main === "true" || main === true) {
+                metadata.main = true;
+            }
+            let parentId = "";
+            if (isAddVersion && parent) {
+                parentId = parent;
+            }
+            let fileRecord;
+            if (parentId) {
+                metadata.parent = parentId;
+                if (locked_by && locked_by_name) {
+                    metadata.locked_by = locked_by;
+                    metadata.locked_by_name = locked_by_name;
+                }
+                const fileRecord = yield this.filesService.uploadFile(COLLECTION_NAME, file, {}, {
+                    metadata: metadata,
+                });
+                if (fileRecord) {
+                    yield this.mongodbService.findOneAndUpdate(COLLECTION_NAME, {
+                        "metadata.parent": parentId,
+                        "metadata.current": true,
+                    }, {
+                        $unset: {
+                            "metadata.current": "",
+                        },
+                    }, {});
+                    if ((overwrite === null || overwrite === void 0 ? void 0 : overwrite.toLowerCase()) === "true") {
+                        yield this.mongodbService.deleteMany(COLLECTION_NAME, {
+                            "metadata.instance": instanceId,
+                            "metadata.parent": parentId,
+                            "metadata.owner": owner,
+                            "metadata.approve": approve,
+                            "metadata.current": {
+                                $ne: true,
+                            },
+                        });
+                    }
+                }
+            }
+            else {
+                fileRecord = yield this.filesService.uploadFile(COLLECTION_NAME, file, {}, {
+                    metadata: metadata,
+                });
+                yield this.mongodbService.findOneAndUpdateData(COLLECTION_NAME, { _id: fileRecord._id }, { "metadata.parent": fileRecord._id });
+            }
+            return {
+                version_id: fileRecord._id,
+                size: file.size,
+            };
+        });
+    }
+    copyInstanceFiles(sourceInstanceId_1, targetInstanceId_1, targetInstanceApproveId_1, userSession_1, _a) {
+        return __awaiter(this, arguments, void 0, function* (sourceInstanceId, targetInstanceId, targetInstanceApproveId, userSession, { can_edit_main_attach, can_edit_normal_attach }) {
+            const userId = userSession["userId"];
+            const spaceId = userSession["spaceId"];
+            const filesInfo = yield this.mongodbService.find(COLLECTION_NAME, {
+                "metadata.instance": sourceInstanceId,
+                "metadata.current": true,
+            });
+            const metadata = {
+                owner: userId,
+                owner_name: userSession.name,
+                space: spaceId,
+                instance: targetInstanceId,
+                approve: targetInstanceApproveId,
+                current: true,
+                main: false,
+            };
+            for (const fileInfo of filesInfo) {
+                if (fileInfo.metadata.main == true) {
+                    if (can_edit_main_attach != true && can_edit_normal_attach != true)
+                        continue;
+                }
+                else {
+                    if (can_edit_normal_attach != true)
+                        continue;
+                }
+                if (fileInfo.metadata.main == true && can_edit_main_attach == true) {
+                    metadata.main = true;
+                }
+                else {
+                    metadata.main = false;
+                }
+                const fileStream = yield this.filesService.downloadFileStream(COLLECTION_NAME, fileInfo._id);
+                const file = yield streamToMulterFile(fileStream, fileInfo.original.name, fileInfo.original.type);
+                yield this.uploadFile(targetInstanceId, file, metadata, userSession);
+            }
+        });
+    }
+    formatFileName(originalName, uploadFrom) {
+        if (uploadFrom === "mobile") {
+            return originalName.replace(/ /g, "_");
+        }
+        return originalName;
+    }
+};
+exports.FileService = FileService;
+exports.FileService = FileService = FileService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [files_1.FilesService,
+        core_1.MongodbService])
+], FileService);
+//# sourceMappingURL=file.service.js.map

package/dist/instance_files/file.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file.service.js","sourceRoot":"","sources":["../../src/instance_files/file.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/server",
-  "version": "3.0.0-beta.58",
+  "version": "3.0.0-beta.60",
   "description": "",
   "author": "",
   "license": "AGPL-3.0-only",
@@ -21,12 +21,12 @@
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
   },
   "dependencies": {
-    "@builder6/server": "^0.16.3-alpha.21",
+    "@builder6/server": "^0.16.3-alpha.22",
     "@steedos/ee_unpkg": "1.0.0",
-    "@steedos/service-community": "3.0.0-beta.58",
+    "@steedos/service-community": "3.0.0-beta.60",
     "@steedos/service-enterprise": "^3.0.0-beta.1",
     "@steedos/service-license": "2.5.49",
-    "@steedos/webapp": "3.0.0-beta.58"
+    "@steedos/webapp": "3.0.0-beta.60"
   },
   "devDependencies": {
     "@nestjs/cli": "^11.0.0",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "91582b851bcf50f5440bbc0219b6b8cb1a11a904"
+  "gitHead": "381895982baafa91e5fbddba5bad0849ce009b48"
 }