@certd/plugin-lib 1.33.6 → 1.33.8

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.
Files changed (40) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/aliyun/lib/oss-client.d.ts +4 -2
  3. package/dist/aliyun/lib/oss-client.js +17 -1
  4. package/dist/ftp/client.d.ts +3 -1
  5. package/dist/ftp/client.js +16 -2
  6. package/dist/index.d.ts +2 -0
  7. package/dist/index.js +3 -1
  8. package/dist/oss/api.d.ts +46 -0
  9. package/dist/oss/api.js +48 -0
  10. package/dist/oss/factory.d.ts +10 -0
  11. package/dist/oss/factory.js +46 -0
  12. package/dist/oss/impls/alioss.d.ts +13 -0
  13. package/dist/oss/impls/alioss.js +55 -0
  14. package/dist/oss/impls/ftp.d.ts +12 -0
  15. package/dist/oss/impls/ftp.js +75 -0
  16. package/dist/oss/impls/qiniuoss.d.ts +13 -0
  17. package/dist/oss/impls/qiniuoss.js +47 -0
  18. package/dist/oss/impls/s3.d.ts +13 -0
  19. package/dist/oss/impls/s3.js +89 -0
  20. package/dist/oss/impls/sftp.d.ts +10 -0
  21. package/dist/oss/impls/sftp.js +79 -0
  22. package/dist/oss/impls/ssh.d.ts +11 -0
  23. package/dist/oss/impls/ssh.js +55 -0
  24. package/dist/oss/impls/tencentcos.d.ts +13 -0
  25. package/dist/oss/impls/tencentcos.js +51 -0
  26. package/dist/oss/index.d.ts +2 -0
  27. package/dist/oss/index.js +3 -0
  28. package/dist/qiniu/lib/sdk.d.ts +4 -1
  29. package/dist/qiniu/lib/sdk.js +45 -9
  30. package/dist/s3/access.d.ts +23 -0
  31. package/dist/s3/access.js +108 -0
  32. package/dist/s3/index.d.ts +1 -0
  33. package/dist/s3/index.js +2 -0
  34. package/dist/ssh/ssh-access.d.ts +1 -0
  35. package/dist/ssh/ssh-access.js +13 -1
  36. package/dist/ssh/ssh.d.ts +18 -0
  37. package/dist/ssh/ssh.js +88 -25
  38. package/dist/tencent/lib/cos-client.d.ts +3 -1
  39. package/dist/tencent/lib/cos-client.js +42 -2
  40. package/package.json +6 -5
@@ -15,6 +15,7 @@ let SshAccess = class SshAccess extends BaseAccess {
15
15
  password;
16
16
  privateKey;
17
17
  passphrase;
18
+ pty;
18
19
  socksProxy;
19
20
  windows = false;
20
21
  encoding;
@@ -95,6 +96,17 @@ __decorate([
95
96
  }),
96
97
  __metadata("design:type", String)
97
98
  ], SshAccess.prototype, "passphrase", void 0);
99
+ __decorate([
100
+ AccessInput({
101
+ title: "伪终端",
102
+ helper: "如果登录报错:all authentication methods failed,可以尝试开启伪终端模式进行keyboard-interactive方式登录\n开启后对日志输出有一定的影响",
103
+ component: {
104
+ name: "a-switch",
105
+ vModel: "checked",
106
+ },
107
+ }),
108
+ __metadata("design:type", Boolean)
109
+ ], SshAccess.prototype, "pty", void 0);
98
110
  __decorate([
99
111
  AccessInput({
100
112
  title: "socks代理",
@@ -168,4 +180,4 @@ SshAccess = __decorate([
168
180
  ], SshAccess);
169
181
  export { SshAccess };
170
182
  new SshAccess();
171
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NoLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zc2gvc3NoLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQVE3RCxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVUsU0FBUSxVQUFVO0lBUXZDLElBQUksQ0FBVTtJQVVkLElBQUksQ0FBVTtJQU1kLFFBQVEsQ0FBVTtJQVVsQixRQUFRLENBQVU7SUFVbEIsVUFBVSxDQUFVO0lBV3BCLFVBQVUsQ0FBVTtJQVlwQixVQUFVLENBQVU7SUFVcEIsT0FBTyxHQUFHLEtBQUssQ0FBQztJQWVoQixRQUFRLENBQVM7SUFxQmpCLFdBQVcsR0FBRyxJQUFJLENBQUM7SUFFbkIsS0FBSyxDQUFDLGFBQWE7UUFDakIsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLE1BQU0sTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sTUFBTSxHQUFHLElBQUksU0FBUyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFOUMsTUFBTSxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQ2hCLFdBQVcsRUFBRSxJQUFJO1lBQ2pCLE1BQU0sRUFBRSxZQUFZO1NBQ3JCLENBQUMsQ0FBQztRQUNILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGLENBQUE7QUFySEM7SUFQQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsTUFBTTtRQUNiLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxXQUFXO1NBQ3pCO1FBQ0QsUUFBUSxFQUFFLElBQUk7S0FDZixDQUFDOzt1Q0FDWTtBQVVkO0lBVEMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLElBQUk7UUFDWCxLQUFLLEVBQUUsRUFBRTtRQUNULFNBQVMsRUFBRTtZQUNULElBQUksRUFBRSxn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
183
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NoLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zc2gvc3NoLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQVE3RCxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVUsU0FBUSxVQUFVO0lBUXZDLElBQUksQ0FBVTtJQVVkLElBQUksQ0FBVTtJQU1kLFFBQVEsQ0FBVTtJQVVsQixRQUFRLENBQVU7SUFVbEIsVUFBVSxDQUFVO0lBV3BCLFVBQVUsQ0FBVTtJQVVwQixHQUFHLENBQVc7SUFZZCxVQUFVLENBQVU7SUFVcEIsT0FBTyxHQUFHLEtBQUssQ0FBQztJQWVoQixRQUFRLENBQVM7SUFxQmpCLFdBQVcsR0FBRyxJQUFJLENBQUM7SUFFbkIsS0FBSyxDQUFDLGFBQWE7UUFDakIsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLE1BQU0sTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sTUFBTSxHQUFHLElBQUksU0FBUyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFOUMsTUFBTSxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQ2hCLFdBQVcsRUFBRSxJQUFJO1lBQ2pCLE1BQU0sRUFBRSxZQUFZO1NBQ3JCLENBQUMsQ0FBQztRQUNILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGLENBQUE7QUEvSEM7SUFQQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsTUFBTTtRQUNiLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxXQUFXO1NBQ3pCO1FBQ0QsUUFBUSxFQUFFLElBQUk7S0FDZixDQUFDOzt1Q0FDWTtBQVVkO0lBVEMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLElBQUk7UUFDWCxLQUFLLEVBQUUsRUFBRTtRQUNULFNBQVMsRUFBRTtZ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
package/dist/ssh/ssh.d.ts CHANGED
@@ -37,6 +37,10 @@ export declare class AsyncSsh2Client {
37
37
  mode?: string;
38
38
  };
39
39
  }): Promise<unknown>;
40
+ listDir(options: {
41
+ sftp: any;
42
+ remotePath: string;
43
+ }): Promise<unknown>;
40
44
  unlink(options: {
41
45
  sftp: any;
42
46
  remotePath: string;
@@ -48,6 +52,11 @@ export declare class AsyncSsh2Client {
48
52
  shell(script: string | string[]): Promise<string>;
49
53
  end(): void;
50
54
  private parseSocksProxyFromUri;
55
+ download(param: {
56
+ remotePath: string;
57
+ savePath: string;
58
+ sftp: any;
59
+ }): Promise<unknown>;
51
60
  }
52
61
  export declare class SshClient {
53
62
  logger: ILogger;
@@ -109,4 +118,13 @@ export declare class SshClient {
109
118
  connectConf: SshAccess;
110
119
  callable: (conn: AsyncSsh2Client) => Promise<T>;
111
120
  }): Promise<T>;
121
+ listDir(param: {
122
+ connectConf: any;
123
+ dir: string;
124
+ }): Promise<any>;
125
+ download(param: {
126
+ connectConf: any;
127
+ filePath: string;
128
+ savePath: string;
129
+ }): Promise<any>;
112
130
  }
package/dist/ssh/ssh.js CHANGED
@@ -107,6 +107,19 @@ export class AsyncSsh2Client {
107
107
  });
108
108
  });
109
109
  }
110
+ async listDir(options) {
111
+ const { sftp, remotePath } = options;
112
+ return new Promise((resolve, reject) => {
113
+ this.logger.info(`listDir:${remotePath}`);
114
+ sftp.readdir(remotePath, (err, list) => {
115
+ if (err) {
116
+ reject(err);
117
+ return;
118
+ }
119
+ resolve(list);
120
+ });
121
+ });
122
+ }
110
123
  async unlink(options) {
111
124
  const { sftp, remotePath } = options;
112
125
  return new Promise((resolve, reject) => {
@@ -134,7 +147,10 @@ export class AsyncSsh2Client {
134
147
  // }
135
148
  return new Promise((resolve, reject) => {
136
149
  this.logger.info(`执行命令:[${this.connConf.host}][exec]: \n` + script);
137
- this.conn.exec(script, { pty: true, env: opts.env }, (err, stream) => {
150
+ // pty 伪终端,window下的输出会带上conhost.exe之类的多余的字符串,影响返回结果判断
151
+ // linux下 当使用keyboard-interactive 登录时,需要pty
152
+ const pty = this.connConf.pty; //linux下开启伪终端,windows下不开启
153
+ this.conn.exec(script, { pty, env: opts.env }, (err, stream) => {
138
154
  if (err) {
139
155
  reject(err);
140
156
  return;
@@ -242,6 +258,23 @@ export class AsyncSsh2Client {
242
258
  }
243
259
  return proxy;
244
260
  }
261
+ async download(param) {
262
+ return new Promise((resolve, reject) => {
263
+ const { remotePath, savePath, sftp } = param;
264
+ sftp.fastGet(remotePath, savePath, {
265
+ step: (transferred, chunk, total) => {
266
+ this.logger.info(`${transferred} / ${total}`);
267
+ },
268
+ }, (err) => {
269
+ if (err) {
270
+ reject(err);
271
+ }
272
+ else {
273
+ resolve({});
274
+ }
275
+ });
276
+ });
277
+ }
245
278
  }
246
279
  export class SshClient {
247
280
  logger;
@@ -287,17 +320,17 @@ export class SshClient {
287
320
  await conn.exec(mkdirCmd);
288
321
  }
289
322
  }
290
- if (options.uploadType === "sftp") {
291
- const sftp = await conn.getSftp();
323
+ if (options.uploadType === "scp") {
324
+ //scp
292
325
  for (const transport of transports) {
293
- await conn.fastPut({ sftp, ...transport, opts });
326
+ await this.scpUpload({ conn, ...transport, opts });
327
+ await new Promise(resolve => setTimeout(resolve, 1000));
294
328
  }
295
329
  }
296
330
  else {
297
- //scp
331
+ const sftp = await conn.getSftp();
298
332
  for (const transport of transports) {
299
- await this.scpUpload({ conn, ...transport, opts });
300
- await new Promise(resolve => setTimeout(resolve, 1000));
333
+ await conn.fastPut({ sftp, ...transport, opts });
301
334
  }
302
335
  }
303
336
  this.logger.info("文件全部上传成功");
@@ -315,23 +348,28 @@ export class SshClient {
315
348
  if (err) {
316
349
  return reject(err);
317
350
  }
318
- // 准备 SCP 协议头
319
- const fileStats = fs.statSync(localPath);
320
- const fileName = path.basename(localPath);
321
- // SCP 协议格式:C[权限] [文件大小] [文件名]\n
322
- stream.write(`C0644 ${fileStats.size} ${fileName}\n`);
323
- // 通过管道传输文件
324
- fs.createReadStream(localPath)
325
- .on("error", e => {
326
- this.logger.info("read stream error", e);
351
+ try {
352
+ // 准备 SCP 协议头
353
+ const fileStats = fs.statSync(localPath);
354
+ const fileName = path.basename(localPath);
355
+ // SCP 协议格式:C[权限] [文件大小] [文件名]\n
356
+ stream.write(`C0644 ${fileStats.size} ${fileName}\n`);
357
+ // 通过管道传输文件
358
+ fs.createReadStream(localPath)
359
+ .on("error", e => {
360
+ this.logger.info("read stream error", e);
361
+ reject(e);
362
+ })
363
+ .pipe(stream)
364
+ .on("finish", async () => {
365
+ this.logger.info(`上传完成:${localPath} => ${remotePath}`);
366
+ resolve(true);
367
+ })
368
+ .on("error", reject);
369
+ }
370
+ catch (e) {
327
371
  reject(e);
328
- })
329
- .pipe(stream)
330
- .on("finish", async () => {
331
- this.logger.info(`上传完成:${localPath} => ${remotePath}`);
332
- resolve(true);
333
- })
334
- .on("error", reject);
372
+ }
335
373
  });
336
374
  }
337
375
  catch (e) {
@@ -429,7 +467,7 @@ export class SshClient {
429
467
  script = envScripts.join(newLine) + newLine + script;
430
468
  }
431
469
  }
432
- return await conn.exec(script, { env: options.env });
470
+ return await conn.exec(script, {});
433
471
  },
434
472
  });
435
473
  }
@@ -478,5 +516,30 @@ export class SshClient {
478
516
  conn.end();
479
517
  }
480
518
  }
519
+ async listDir(param) {
520
+ return await this._call({
521
+ connectConf: param.connectConf,
522
+ callable: async (conn) => {
523
+ const sftp = await conn.getSftp();
524
+ return await conn.listDir({
525
+ sftp,
526
+ remotePath: param.dir,
527
+ });
528
+ },
529
+ });
530
+ }
531
+ async download(param) {
532
+ return await this._call({
533
+ connectConf: param.connectConf,
534
+ callable: async (conn) => {
535
+ const sftp = await conn.getSftp();
536
+ return await conn.download({
537
+ sftp,
538
+ remotePath: param.filePath,
539
+ savePath: param.savePath,
540
+ });
541
+ },
542
+ });
543
+ }
481
544
  }
482
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../src/ssh/ssh.ts"],"names":[],"mappings":"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"}
545
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../src/ssh/ssh.ts"],"names":[],"mappings":"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"}
@@ -12,6 +12,8 @@ export declare class TencentCosClient {
12
12
  bucket: string;
13
13
  });
14
14
  getCosClient(): Promise<import("cos-nodejs-sdk-v5")>;
15
- uploadFile(key: string, file: Buffer): Promise<unknown>;
15
+ uploadFile(key: string, file: Buffer | string): Promise<unknown>;
16
16
  removeFile(key: string): Promise<unknown>;
17
+ downloadFile(key: string, savePath: string): Promise<unknown>;
18
+ listDir(dirKey: string): Promise<unknown>;
17
19
  }
@@ -1,3 +1,4 @@
1
+ import fs from "fs";
1
2
  export class TencentCosClient {
2
3
  access;
3
4
  logger;
@@ -20,11 +21,15 @@ export class TencentCosClient {
20
21
  async uploadFile(key, file) {
21
22
  const cos = await this.getCosClient();
22
23
  return new Promise((resolve, reject) => {
24
+ let readableStream = file;
25
+ if (typeof file === "string") {
26
+ readableStream = fs.createReadStream(file);
27
+ }
23
28
  cos.putObject({
24
29
  Bucket: this.bucket /* 必须 */,
25
30
  Region: this.region /* 必须 */,
26
31
  Key: key /* 必须 */,
27
- Body: file, // 上传文件对象
32
+ Body: readableStream, // 上传文件对象
28
33
  onProgress: function (progressData) {
29
34
  console.log(JSON.stringify(progressData));
30
35
  },
@@ -53,5 +58,40 @@ export class TencentCosClient {
53
58
  });
54
59
  });
55
60
  }
61
+ async downloadFile(key, savePath) {
62
+ const cos = await this.getCosClient();
63
+ const writeStream = fs.createWriteStream(savePath);
64
+ return new Promise((resolve, reject) => {
65
+ cos.getObject({
66
+ Bucket: this.bucket,
67
+ Region: this.region,
68
+ Key: key,
69
+ Output: writeStream,
70
+ }, function (err, data) {
71
+ if (err) {
72
+ reject(err);
73
+ return;
74
+ }
75
+ resolve(data);
76
+ });
77
+ });
78
+ }
79
+ async listDir(dirKey) {
80
+ const cos = await this.getCosClient();
81
+ return new Promise((resolve, reject) => {
82
+ cos.getBucket({
83
+ Bucket: this.bucket,
84
+ Region: this.region,
85
+ Prefix: dirKey,
86
+ MaxKeys: 1000,
87
+ }, function (err, data) {
88
+ if (err) {
89
+ reject(err);
90
+ return;
91
+ }
92
+ resolve(data.Contents);
93
+ });
94
+ });
95
+ }
56
96
  }
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29zLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZW5jZW50L2xpYi9jb3MtY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE1BQU0sT0FBTyxnQkFBZ0I7SUFDM0IsTUFBTSxDQUFnQjtJQUN0QixNQUFNLENBQVU7SUFDaEIsTUFBTSxDQUFTO0lBQ2YsTUFBTSxDQUFTO0lBRWYsWUFBWSxJQUFnRjtRQUMxRixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDNUIsQ0FBQztJQUVELEtBQUssQ0FBQyxZQUFZO1FBQ2hCLE1BQU0sR0FBRyxHQUFHLE1BQU0sTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDOUMsTUFBTSxZQUFZLEdBQUc7WUFDbkIsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUTtZQUM5QixTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTO1NBQ2pDLENBQUM7UUFDRixPQUFPLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFXLEVBQUUsSUFBWTtRQUN4QyxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN0QyxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQ3JDLEdBQUcsQ0FBQyxTQUFTLENBQ1g7Z0JBQ0UsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUTtnQkFDNUIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUTtnQkFDNUIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxRQUFRO2dCQUNqQixJQUFJLEVBQUUsSUFBSSxFQUFFLFNBQVM7Z0JBQ3JCLFVBQVUsRUFBRSxVQUFVLFlBQVk7b0JBQ2hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO2dCQUM1QyxDQUFDO2FBQ0YsRUFDRCxVQUFVLEdBQUcsRUFBRSxJQUFJO2dCQUNqQixJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUNSLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDWixPQUFPO2dCQUNULENBQUM7Z0JBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hCLENBQUMsQ0FDRixDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFXO1FBQzFCLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3RDLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDckMsR0FBRyxDQUFDLFlBQVksQ0FDZDtnQkFDRSxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07Z0JBQ25CLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtnQkFDbkIsR0FBRyxFQUFFLEdBQUc7YUFDVCxFQUNELFVBQVUsR0FBRyxFQUFFLElBQUk7Z0JBQ2pCLElBQUksR0FBRyxFQUFFLENBQUM7b0JBQ1IsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO29CQUNaLE9BQU87Z0JBQ1QsQ0FBQztnQkFDRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDaEIsQ0FBQyxDQUNGLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRiJ9
97
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29zLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZW5jZW50L2xpYi9jb3MtY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUVwQixNQUFNLE9BQU8sZ0JBQWdCO0lBQzNCLE1BQU0sQ0FBZ0I7SUFDdEIsTUFBTSxDQUFVO0lBQ2hCLE1BQU0sQ0FBUztJQUNmLE1BQU0sQ0FBUztJQUVmLFlBQVksSUFBZ0Y7UUFDMUYsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQzVCLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWTtRQUNoQixNQUFNLEdBQUcsR0FBRyxNQUFNLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBQzlDLE1BQU0sWUFBWSxHQUFHO1lBQ25CLFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVE7WUFDOUIsU0FBUyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUztTQUNqQyxDQUFDO1FBQ0YsT0FBTyxJQUFJLEdBQUcsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBVyxFQUFFLElBQXFCO1FBQ2pELE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3RDLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDckMsSUFBSSxjQUFjLEdBQUcsSUFBVyxDQUFDO1lBQ2pDLElBQUksT0FBTyxJ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
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@certd/plugin-lib",
3
3
  "private": false,
4
- "version": "1.33.6",
4
+ "version": "1.33.8",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
7
7
  "types": "./dist/index.d.ts",
@@ -16,10 +16,11 @@
16
16
  },
17
17
  "dependencies": {
18
18
  "@alicloud/pop-core": "^1.7.10",
19
- "@certd/basic": "^1.33.6",
20
- "@certd/pipeline": "^1.33.6",
19
+ "@aws-sdk/client-s3": "^3.787.0",
20
+ "@certd/basic": "^1.33.8",
21
+ "@certd/pipeline": "^1.33.8",
21
22
  "@kubernetes/client-node": "0.21.0",
22
- "ali-oss": "^6.21.0",
23
+ "ali-oss": "^6.22.0",
23
24
  "basic-ftp": "^5.0.5",
24
25
  "cos-nodejs-sdk-v5": "^2.14.6",
25
26
  "dayjs": "^1.11.7",
@@ -48,5 +49,5 @@
48
49
  "tslib": "^2.8.1",
49
50
  "typescript": "^5.4.2"
50
51
  },
51
- "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
52
+ "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d"
52
53
  }