@yidun/cdn-upload-webpack-plugin 1.1.1 → 1.1.3

package/src/task.js

@@ -1,103 +1,103 @@
-const { noop } = require('./utils')
-
-const TASK_STATUS = {
-  PENDING: 'pending',
-  DOING: 'doing',
-  REJECTED: 'rejected',
-  FULFILLED: 'fulfilled'
-}
-
-let uid = 0 // 任务 id
-/**
- * task 基类，提供重试等功能,供 adaptor 继承，如 NosUploadTask
- */
-class Task {
-  constructor (invoke) {
-    this.status = TASK_STATUS.PENDING
-    this._id = uid++
-    this._invoke = invoke
-    this._retryCount = 3
-  }
-
-  async start () {
-    let retryCount = this._retryCount
-    let res
-    try {
-      this.status = TASK_STATUS.DOING
-      res = await this._invoke()
-    } catch (error) {
-      retryCount--
-      if (retryCount < 0) {
-        this.status = TASK_STATUS.REJECTED
-        return Promise.reject(error)
-      } else {
-        res = await this._invoke()
-      }
-    }
-    this.status = TASK_STATUS.FULFILLED
-    return res
-  }
-}
-
-const PARALLEL_COUNT = 3 // 上传并行数
-/**
- * 任务调度器，完成整个上传任务的调度
- */
-class TaskDispatcher {
-  constructor (tasks, callbacks = {}) {
-    this.status = TASK_STATUS.PENDING
-    this._tasks = tasks
-    this._activeTasks = []
-    this._onError = callbacks.onError || noop
-    this._onSuccess = callbacks.onSuccess || noop
-  }
-
-  getPendingTask (count) {
-    return this._tasks.filter(t => t.status === TASK_STATUS.PENDING).slice(0, count)
-  }
-
-  getPendingTaskCount () {
-    return this._tasks.filter(t => t.status === TASK_STATUS.PENDING).length
-  }
-
-  removeActiveTask (task) {
-    const index = this._activeTasks.findIndex(t => task._id === t._id)
-    if (index > -1) {
-      this._activeTasks.splice(index, 1)
-    }
-  }
-
-  isAllTaskFulfilled () {
-    return this._tasks.every(t => t.status === TASK_STATUS.FULFILLED)
-  }
-
-  /**
-   * 任务调度入口
-   * @param {Number} count
-   */
-  dispatch (count = PARALLEL_COUNT) {
-    if (TASK_STATUS.REJECTED === this.status) return
-
-    this._activeTasks = this._activeTasks.concat(this.getPendingTask(count))
-    this._activeTasks.forEach(task => {
-      if (task.status === TASK_STATUS.PENDING) {
-        task.start().then(res => {
-          this.removeActiveTask(task)
-          if (this.getPendingTaskCount() > 0) {
-            this.dispatch(1)
-          } else if (this.isAllTaskFulfilled()) {
-            this._onSuccess(this._tasks)
-          }
-        }).catch(error => {
-          this.status = TASK_STATUS.REJECTED
-          this._onError(error)
-        })
-      }
-    })
-  }
-}
-
-module.exports = {
-  Task,
-  TaskDispatcher
-}
+const { noop } = require('./utils')
+
+const TASK_STATUS = {
+  PENDING: 'pending',
+  DOING: 'doing',
+  REJECTED: 'rejected',
+  FULFILLED: 'fulfilled'
+}
+
+let uid = 0 // 任务 id
+/**
+ * task 基类，提供重试等功能,供 adaptor 继承，如 NosUploadTask
+ */
+class Task {
+  constructor (invoke) {
+    this.status = TASK_STATUS.PENDING
+    this._id = uid++
+    this._invoke = invoke
+    this._retryCount = 3
+  }
+
+  async start () {
+    let retryCount = this._retryCount
+    let res
+    try {
+      this.status = TASK_STATUS.DOING
+      res = await this._invoke()
+    } catch (error) {
+      retryCount--
+      if (retryCount < 0) {
+        this.status = TASK_STATUS.REJECTED
+        return Promise.reject(error)
+      } else {
+        res = await this._invoke()
+      }
+    }
+    this.status = TASK_STATUS.FULFILLED
+    return res
+  }
+}
+
+const PARALLEL_COUNT = 3 // 上传并行数
+/**
+ * 任务调度器，完成整个上传任务的调度
+ */
+class TaskDispatcher {
+  constructor (tasks, callbacks = {}) {
+    this.status = TASK_STATUS.PENDING
+    this._tasks = tasks
+    this._activeTasks = []
+    this._onError = callbacks.onError || noop
+    this._onSuccess = callbacks.onSuccess || noop
+  }
+
+  getPendingTask (count) {
+    return this._tasks.filter(t => t.status === TASK_STATUS.PENDING).slice(0, count)
+  }
+
+  getPendingTaskCount () {
+    return this._tasks.filter(t => t.status === TASK_STATUS.PENDING).length
+  }
+
+  removeActiveTask (task) {
+    const index = this._activeTasks.findIndex(t => task._id === t._id)
+    if (index > -1) {
+      this._activeTasks.splice(index, 1)
+    }
+  }
+
+  isAllTaskFulfilled () {
+    return this._tasks.every(t => t.status === TASK_STATUS.FULFILLED)
+  }
+
+  /**
+   * 任务调度入口
+   * @param {Number} count
+   */
+  dispatch (count = PARALLEL_COUNT) {
+    if (TASK_STATUS.REJECTED === this.status) return
+
+    this._activeTasks = this._activeTasks.concat(this.getPendingTask(count))
+    this._activeTasks.forEach(task => {
+      if (task.status === TASK_STATUS.PENDING) {
+        task.start().then(res => {
+          this.removeActiveTask(task)
+          if (this.getPendingTaskCount() > 0) {
+            this.dispatch(1)
+          } else if (this.isAllTaskFulfilled()) {
+            this._onSuccess(this._tasks)
+          }
+        }).catch(error => {
+          this.status = TASK_STATUS.REJECTED
+          this._onError(error)
+        })
+      }
+    })
+  }
+}
+
+module.exports = {
+  Task,
+  TaskDispatcher
+}

package/src/utils.js

@@ -1,41 +1,41 @@
-const Promise = require('bluebird')
-const fs = Promise.promisifyAll(require('fs'))
-const path = require('path')
-
-function getFiles (dirs, includeRootDir = true, ignores) {
-  if (typeof dirs === 'string') dirs = [dirs]
-  if (ignores instanceof RegExp) ignores = [ignores]
-
-  const res = []
-  dirs.forEach(dir => deep(dir, dir))
-
-  function deep (dir, rootDir) {
-    const files = fs.readdirSync(dir)
-    files.forEach(fileName => {
-      const pathName = `${dir}${path.sep}${fileName}`
-      const info = fs.lstatSync(pathName)
-      if (info.isDirectory()) {
-        deep(pathName, rootDir)
-      } else {
-        if (!ignores || ignores.every(ignore => !ignore.test(pathName))) {
-          res.push({
-            path: pathName,
-            relative: path.relative(includeRootDir ? path.join(rootDir, '../') : rootDir, pathName)
-          })
-        }
-      }
-    })
-  }
-
-  return res
-}
-
-function normalizeObjectKey (objectKey) {
-  return path.normalize(objectKey).replace(/\\/g, '/')
-}
-
-module.exports = {
-  getFiles,
-  normalizeObjectKey,
-  noop () {}
-}
+const Promise = require('bluebird')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
+
+function getFiles (dirs, includeRootDir = true, ignores) {
+  if (typeof dirs === 'string') dirs = [dirs]
+  if (ignores instanceof RegExp) ignores = [ignores]
+
+  const res = []
+  dirs.forEach(dir => deep(dir, dir))
+
+  function deep (dir, rootDir) {
+    const files = fs.readdirSync(dir)
+    files.forEach(fileName => {
+      const pathName = `${dir}${path.sep}${fileName}`
+      const info = fs.lstatSync(pathName)
+      if (info.isDirectory()) {
+        deep(pathName, rootDir)
+      } else {
+        if (!ignores || ignores.every(ignore => !ignore.test(pathName))) {
+          res.push({
+            path: pathName,
+            relative: path.relative(includeRootDir ? path.join(rootDir, '../') : rootDir, pathName)
+          })
+        }
+      }
+    })
+  }
+
+  return res
+}
+
+function normalizeObjectKey (objectKey) {
+  return path.normalize(objectKey).replace(/\\/g, '/')
+}
+
+module.exports = {
+  getFiles,
+  normalizeObjectKey,
+  noop () {}
+}

package/src/vite.js

@@ -1,39 +1,46 @@
-const { getFiles } = require('./utils')
-const { TaskDispatcher } = require('./task')
-const NosUploadTask = require('./adaptor/nos')
-
-/**
- * @param {Object} options
- * @param {Array|String} dirs 待上传的文件目录
- * @param {Boolean} includeRootDir 文件的相对路径计算时包不包含根目录，默认 true
- * @param {RegExp|Array<RegExp>} ignores 排除特定文件
- * @param {Object} client 上传 client 配置，目前只支持 NosClient，不同的 client 配置参数可能不同，以 nos 举例
- * @param {String} accessId
- * @param {String} secretKey
- * @param {String} bucket 桶名
- * @param {String} namespace 不同项目在使用同一个桶时做隔离
- * @param {Number} parallelCount 并行上传数, 默认 3
- * @returns
- */
-function CdnUploadVitePlugin (options) {
-  const { dirs, includeRootDir, ignores, client, parallelCount } = options
-  return {
-    name: 'vite-plugin-cdn-upload',
-    closeBundle () {
-      const files = getFiles(dirs, includeRootDir, ignores)
-      const tasks = files.map((file) => new NosUploadTask(client, file))
-      return new Promise((resolve, reject) => {
-        const taskDispatcher = new TaskDispatcher(tasks, {
-          onSuccess: () => {
-            console.log('CdnUploadWebpackPlugin: assets upload success')
-            resolve()
-          },
-          onError: (error) => reject(error)
-        })
-        console.log('CdnUploadWebpackPlugin: assets uploading ...')
-        taskDispatcher.dispatch(parallelCount)
-      })
-    }
-  }
-}
-module.exports = CdnUploadVitePlugin
+const fetch = require('node-fetch')
+const { getFiles } = require('./utils')
+const { TaskDispatcher } = require('./task')
+const NosUploadTask = require('./adaptor/nos')
+
+/**
+ * @param {Object} options
+ * @param {Array|String} dirs 待上传的文件目录
+ * @param {Boolean} includeRootDir 文件的相对路径计算时包不包含根目录，默认 true
+ * @param {RegExp|Array<RegExp>} ignores 排除特定文件
+ * @param {Object} client 上传 client 配置，目前只支持 NosClient，不同的 client 配置参数可能不同，以 nos 举例
+ * @param {String} accessId
+ * @param {String} secretKey
+ * @param {String} bucket 桶名
+ * @param {String} namespace 不同项目在使用同一个桶时做隔离
+ * @param {Number} parallelCount 并行上传数, 默认 3
+ * @returns
+ */
+function CdnUploadVitePlugin (options) {
+  const { dirs, includeRootDir, ignores, client, parallelCount, domain = 'https://yidunfe.nosdn.127.net' } = options
+  return {
+    name: 'vite-plugin-cdn-upload',
+    closeBundle () {
+      const files = getFiles(dirs, includeRootDir, ignores)
+      const tasks = files.map((file) => new NosUploadTask(client, file))
+      return new Promise((resolve, reject) => {
+        const taskDispatcher = new TaskDispatcher(tasks, {
+          onSuccess: async (task) => {
+            // cdn 上传成功后健康检查
+            const { _file, _namespace } = task?.[0] || {}
+            const data = await fetch(`${domain}/${_namespace}/${_file.relative}`)
+            if (!data.ok || data.status !== 200) {
+              reject(new Error(`CdnUploadVitePlugin Error: url: ${data.url}, status: ${data.status}`))
+            }
+            console.log('CdnUploadVitePlugin: assets upload success')
+            resolve()
+          },
+          onError: (error) => reject(error)
+        })
+        console.log('CdnUploadVitePlugin: assets uploading ...')
+        taskDispatcher.dispatch(parallelCount)
+      })
+    }
+  }
+}
+module.exports = CdnUploadVitePlugin