@lark-apaas/fullstack-nestjs-core 1.1.17-alpha.4 → 1.1.17-alpha.6

package/dist/index.cjs

@@ -797,11 +797,11 @@ var FileService = class {
   }
   requestContextService;
   httpClient;
-  fileService;
+  fileServiceCore;
   constructor(requestContextService, httpClient) {
     this.requestContextService = requestContextService;
     this.httpClient = httpClient;
-    this.fileService = new import_file_service.FileService(this.httpClient);
+    this.fileServiceCore = new import_file_service.FileService(this.httpClient);
   }
   from(bucket) {
     this.requestContextService.setContext({
@@ -809,18 +809,61 @@ var FileService = class {
     });
     return this;
   }
+  async upload(file, options) {
+    return this.fileServiceCore.upload({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      fileBody: file,
+      options
+    });
+  }
+  download(path) {
+    const downloadFn = /* @__PURE__ */ __name(async () => this.fileServiceCore.downloadInner({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      filePath: path
+    }), "downloadFn");
+    return new import_file_service.FileDownloadBuilder(downloadFn);
+  }
+  async list(prefix, searchOptions) {
+    return this.fileServiceCore.list({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      prefix,
+      searchOptions
+    });
+  }
+  async remove(filePaths) {
+    return this.fileServiceCore.remove({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      filePaths
+    });
+  }
   async createSignedUrl(path, expiresIn) {
-    const bucketId = await this.getDefaultBucket();
-    return this.fileService.createSignedUrl({
+    return this.fileServiceCore.createSignedUrl({
       appId: this.getAppId(),
-      bucketId,
+      bucketId: await this.getDefaultBucket(),
       filePath: path,
       expiresIn
     });
   }
+  async getFileMetadata(filePath) {
+    return this.fileServiceCore.getFileMetadata({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      filePath
+    });
+  }
   async getDefaultBucket() {
+    const reqContext = this.requestContextService.getContext();
+    const bucketFromContext = reqContext?.bucket;
+    if (bucketFromContext) {
+      return bucketFromContext;
+    }
     const appId = this.getAppId();
-    return this.fileService.getDefaultBucket(appId);
+    const bucket = await this.fileServiceCore.getDefaultBucket(appId);
+    return bucket;
   }
   getAppId() {
     const requestCtx = this.requestContextService.getContext();

package/dist/index.d.cts

@@ -2,15 +2,17 @@ import { NestModule, DynamicModule, MiddlewareConsumer, NestMiddleware } from '@
 import { HttpClientConfig, PlatformPluginOptions } from '@lark-apaas/http-client';
 import { NestExpressApplication } from '@nestjs/platform-express';
 export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options } from '@lark-apaas/nestjs-openapi-devtools';
-import { Request, Response as Response$1, NextFunction } from 'express';
+import { Request, Response, NextFunction } from 'express';
 import { PlatformHttpClient, RequestContextService } from '@lark-apaas/nestjs-common';
 export { AutoTrace } from '@lark-apaas/nestjs-common';
+import * as _lark_apaas_file_service from '@lark-apaas/file-service';
+import { FileBody, UploadOptions, FileDownloadBuilder, SearchOptions } from '@lark-apaas/file-service';
+export * from '@lark-apaas/file-service';
 export * from '@lark-apaas/nestjs-authnpaas';
 export * from '@lark-apaas/nestjs-capability';
 export * from '@lark-apaas/nestjs-datapaas';
 export * from '@lark-apaas/nestjs-observable';
 export * from '@lark-apaas/nestjs-trigger';
-export * from '@lark-apaas/file-service';
 
 declare global {
   namespace Express {
@@ -99,7 +101,7 @@ interface CsrfTokenOptions {
 declare class CsrfTokenMiddleware implements NestMiddleware {
     private static options;
     static configure(opts: CsrfTokenOptions): void;
-    use(req: Request, res: Response$1, next: NextFunction): void;
+    use(req: Request, res: Response, next: NextFunction): void;
 }
 
 interface CsrfOptions {
@@ -110,11 +112,11 @@ interface CsrfOptions {
 declare class CsrfMiddleware implements NestMiddleware {
     private static options;
     static configure(opts: CsrfOptions): void;
-    use(req: Request, res: Response$1, next: NextFunction): void;
+    use(req: Request, res: Response, next: NextFunction): void;
 }
 
 declare class UserContextMiddleware implements NestMiddleware {
-    use(req: Request, _res: Response$1, next: NextFunction): void;
+    use(req: Request, _res: Response, next: NextFunction): void;
 }
 
 declare class ViewContextMiddleware implements NestMiddleware {
@@ -122,7 +124,7 @@ declare class ViewContextMiddleware implements NestMiddleware {
     private readonly logger;
     constructor(client: PlatformHttpClient);
     private getAppInfo;
-    use(req: Request, res: Response$1, next: NextFunction): Promise<void>;
+    use(req: Request, res: Response, next: NextFunction): Promise<void>;
 }
 
 /**
@@ -139,10 +141,20 @@ interface ApiNotFoundResponse {
 declare class FileService {
     private readonly requestContextService;
     private readonly httpClient;
-    private readonly fileService;
+    private readonly fileServiceCore;
     constructor(requestContextService: RequestContextService, httpClient: PlatformHttpClient);
     from(bucket: string): this;
-    createSignedUrl(path: string, expiresIn: number): Promise<Response>;
+    upload(file: FileBody, options?: UploadOptions): Promise<{
+        bucketID: string;
+        filePath: string;
+        downloadURL: string;
+        fileName: string;
+    } | undefined>;
+    download(path: string): FileDownloadBuilder;
+    list(prefix: string, searchOptions?: SearchOptions): Promise<_lark_apaas_file_service.ListResponse>;
+    remove(filePaths: string[]): Promise<_lark_apaas_file_service.FileMeta[]>;
+    createSignedUrl(path: string, expiresIn: number): Promise<string>;
+    getFileMetadata(filePath: string): Promise<_lark_apaas_file_service.FileMeta | null>;
     getDefaultBucket(): Promise<string>;
     private getAppId;
 }

package/dist/index.d.ts

@@ -2,15 +2,17 @@ import { NestModule, DynamicModule, MiddlewareConsumer, NestMiddleware } from '@
 import { HttpClientConfig, PlatformPluginOptions } from '@lark-apaas/http-client';
 import { NestExpressApplication } from '@nestjs/platform-express';
 export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options } from '@lark-apaas/nestjs-openapi-devtools';
-import { Request, Response as Response$1, NextFunction } from 'express';
+import { Request, Response, NextFunction } from 'express';
 import { PlatformHttpClient, RequestContextService } from '@lark-apaas/nestjs-common';
 export { AutoTrace } from '@lark-apaas/nestjs-common';
+import * as _lark_apaas_file_service from '@lark-apaas/file-service';
+import { FileBody, UploadOptions, FileDownloadBuilder, SearchOptions } from '@lark-apaas/file-service';
+export * from '@lark-apaas/file-service';
 export * from '@lark-apaas/nestjs-authnpaas';
 export * from '@lark-apaas/nestjs-capability';
 export * from '@lark-apaas/nestjs-datapaas';
 export * from '@lark-apaas/nestjs-observable';
 export * from '@lark-apaas/nestjs-trigger';
-export * from '@lark-apaas/file-service';
 
 declare global {
   namespace Express {
@@ -99,7 +101,7 @@ interface CsrfTokenOptions {
 declare class CsrfTokenMiddleware implements NestMiddleware {
     private static options;
     static configure(opts: CsrfTokenOptions): void;
-    use(req: Request, res: Response$1, next: NextFunction): void;
+    use(req: Request, res: Response, next: NextFunction): void;
 }
 
 interface CsrfOptions {
@@ -110,11 +112,11 @@ interface CsrfOptions {
 declare class CsrfMiddleware implements NestMiddleware {
     private static options;
     static configure(opts: CsrfOptions): void;
-    use(req: Request, res: Response$1, next: NextFunction): void;
+    use(req: Request, res: Response, next: NextFunction): void;
 }
 
 declare class UserContextMiddleware implements NestMiddleware {
-    use(req: Request, _res: Response$1, next: NextFunction): void;
+    use(req: Request, _res: Response, next: NextFunction): void;
 }
 
 declare class ViewContextMiddleware implements NestMiddleware {
@@ -122,7 +124,7 @@ declare class ViewContextMiddleware implements NestMiddleware {
     private readonly logger;
     constructor(client: PlatformHttpClient);
     private getAppInfo;
-    use(req: Request, res: Response$1, next: NextFunction): Promise<void>;
+    use(req: Request, res: Response, next: NextFunction): Promise<void>;
 }
 
 /**
@@ -139,10 +141,20 @@ interface ApiNotFoundResponse {
 declare class FileService {
     private readonly requestContextService;
     private readonly httpClient;
-    private readonly fileService;
+    private readonly fileServiceCore;
     constructor(requestContextService: RequestContextService, httpClient: PlatformHttpClient);
     from(bucket: string): this;
-    createSignedUrl(path: string, expiresIn: number): Promise<Response>;
+    upload(file: FileBody, options?: UploadOptions): Promise<{
+        bucketID: string;
+        filePath: string;
+        downloadURL: string;
+        fileName: string;
+    } | undefined>;
+    download(path: string): FileDownloadBuilder;
+    list(prefix: string, searchOptions?: SearchOptions): Promise<_lark_apaas_file_service.ListResponse>;
+    remove(filePaths: string[]): Promise<_lark_apaas_file_service.FileMeta[]>;
+    createSignedUrl(path: string, expiresIn: number): Promise<string>;
+    getFileMetadata(filePath: string): Promise<_lark_apaas_file_service.FileMeta | null>;
     getDefaultBucket(): Promise<string>;
     private getAppId;
 }

package/dist/index.js

@@ -729,7 +729,7 @@ var DISABLE_DATAPASS = process.env.FORCE_FRAMEWORK_DISABLE_DATAPASS === "true";
 // src/services/file.service.ts
 import { Injectable as Injectable9, Inject as Inject2 } from "@nestjs/common";
 import { RequestContextService as RequestContextService2, PLATFORM_HTTP_CLIENT as PLATFORM_HTTP_CLIENT2 } from "@lark-apaas/nestjs-common";
-import { FileService as FileServiceCore } from "@lark-apaas/file-service";
+import { FileService as FileServiceCore, FileDownloadBuilder } from "@lark-apaas/file-service";
 function _ts_decorate9(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);
@@ -753,11 +753,11 @@ var FileService = class {
   }
   requestContextService;
   httpClient;
-  fileService;
+  fileServiceCore;
   constructor(requestContextService, httpClient) {
     this.requestContextService = requestContextService;
     this.httpClient = httpClient;
-    this.fileService = new FileServiceCore(this.httpClient);
+    this.fileServiceCore = new FileServiceCore(this.httpClient);
   }
   from(bucket) {
     this.requestContextService.setContext({
@@ -765,18 +765,61 @@ var FileService = class {
     });
     return this;
   }
+  async upload(file, options) {
+    return this.fileServiceCore.upload({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      fileBody: file,
+      options
+    });
+  }
+  download(path) {
+    const downloadFn = /* @__PURE__ */ __name(async () => this.fileServiceCore.downloadInner({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      filePath: path
+    }), "downloadFn");
+    return new FileDownloadBuilder(downloadFn);
+  }
+  async list(prefix, searchOptions) {
+    return this.fileServiceCore.list({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      prefix,
+      searchOptions
+    });
+  }
+  async remove(filePaths) {
+    return this.fileServiceCore.remove({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      filePaths
+    });
+  }
   async createSignedUrl(path, expiresIn) {
-    const bucketId = await this.getDefaultBucket();
-    return this.fileService.createSignedUrl({
+    return this.fileServiceCore.createSignedUrl({
       appId: this.getAppId(),
-      bucketId,
+      bucketId: await this.getDefaultBucket(),
       filePath: path,
       expiresIn
     });
   }
+  async getFileMetadata(filePath) {
+    return this.fileServiceCore.getFileMetadata({
+      appId: this.getAppId(),
+      bucketId: await this.getDefaultBucket(),
+      filePath
+    });
+  }
   async getDefaultBucket() {
+    const reqContext = this.requestContextService.getContext();
+    const bucketFromContext = reqContext?.bucket;
+    if (bucketFromContext) {
+      return bucketFromContext;
+    }
     const appId = this.getAppId();
-    return this.fileService.getDefaultBucket(appId);
+    const bucket = await this.fileServiceCore.getDefaultBucket(appId);
+    return bucket;
   }
   getAppId() {
     const requestCtx = this.requestContextService.getContext();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.17-alpha.4",
+  "version": "1.1.17-alpha.6",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@lark-apaas/file-service": "0.0.1-alpha.3",
+    "@lark-apaas/file-service": "0.0.1-alpha.8",
     "@lark-apaas/http-client": "^0.1.2",
     "@lark-apaas/nestjs-authnpaas": "^1.0.2",
     "@lark-apaas/nestjs-capability": "^0.1.2",