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

package/example/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "example",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc && vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "vue": "^3.4.21"
+  },
+  "devDependencies": {
+    "@types/node": "^20.12.3",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "typescript": "^5.2.2",
+    "vite": "^5.2.0",
+    "vue-tsc": "^2.0.6"
+  }
+}

package/example/public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

package/example/src/App.vue

@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import HelloWorld from './components/HelloWorld.vue'
+</script>
+
+<template>
+  <div>
+    <a href="https://vitejs.dev" target="_blank">
+      <img src="/vite.svg" class="logo" alt="Vite logo" />
+    </a>
+    <a href="https://vuejs.org/" target="_blank">
+      <img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
+    </a>
+  </div>
+  <HelloWorld msg="Vite + Vue3" />
+</template>
+
+<style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
+</style>

package/example/src/assets/vue.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

package/example/src/components/HelloWorld.vue

@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+defineProps<{ msg: string }>()
+
+const count = ref(0)
+</script>
+
+<template>
+  <h1>{{ msg }}</h1>
+
+  <div class="card">
+    <button type="button" @click="count++">count is {{ count }}</button>
+    <p>
+      Edit
+      <code>components/HelloWorld.vue</code> to test HMR
+    </p>
+  </div>
+
+  <p>
+    Check out
+    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
+      >create-vue</a
+    >, the official Vue + Vite starter
+  </p>
+  <p>
+    Install
+    <a href="https://github.com/vuejs/language-tools" target="_blank">Volar</a>
+    in your IDE for a better DX
+  </p>
+  <p class="read-the-docs">Click on the Vite and Vue logos to learn more</p>
+</template>
+
+<style scoped>
+.read-the-docs {
+  color: #888;
+}
+</style>

package/example/src/main.ts

@@ -0,0 +1,5 @@
+import { createApp } from 'vue'
+import './style.css'
+import App from './App.vue'
+
+createApp(App).mount('#app')

package/example/src/style.css

@@ -0,0 +1,79 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}

package/example/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/example/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "preserve",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}

package/example/tsconfig.node.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "include": ["vite.config.ts"]
+}

package/example/vite.config.ts

@@ -0,0 +1,25 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import { CdnUploadVitePlugin } from '@yidun/cdn-upload-webpack-plugin'
+import path from 'path'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  base: 'https://yidunfe.nosdn.127.net/test-upload/',
+  plugins: [
+    vue(),
+    CdnUploadVitePlugin({
+      dirs: path.join(__dirname, 'dist'),
+      includeRootDir: false,
+      ignore: [/\.html$/, /\.map$/],
+      parallelCount: Infinity,
+      client: {
+        bucket: 'yidunfe',
+        accessId: 'e36babfdcb884368b4e72670e1a08d6a',
+        secretKey: '9d14ac7ba4054498858b572cd9e28c54',
+        endpoint: 'nos-jd.163yun.com',
+        namespace: 'test-upload'
+      }
+    })
+  ],
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yidun/cdn-upload-webpack-plugin",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A webpack plugin for upload dist to cdn.",
   "main": "src/index.js",
   "scripts": {
@@ -17,7 +17,8 @@
     "eslint-plugin-standard": "^5.0.0"
   },
   "dependencies": {
+    "@xgheaven/nos-node-sdk": "^0.2.5",
     "bluebird": "^3.7.2",
-    "nos-node-sdk": "^0.0.5"
+    "node-fetch": "^2.7.0"
   }
 }

package/src/adaptor/nos.js

@@ -1,16 +1,18 @@
 const { Task } = require('../task')
-const NosClient = require('nos-node-sdk')
+const { NosClient } = require('@xgheaven/nos-node-sdk')
 const { normalizeObjectKey } = require('../utils')
+const fs = require('fs')
 
 class NosUploadTask extends Task {
   constructor (nosOptions, file) {
     super(() => this.upload())
-    const nosClient = new NosClient()
-    const { accessId, secretKey, bucket, endpoint = 'nos.netease.com', port = 80, namespace = '' } = nosOptions
-    nosClient.setAccessId(accessId)
-    nosClient.setSecretKey(secretKey)
-    nosClient.setEndpoint(endpoint)
-    nosClient.setPort(port)
+    const { accessId, secretKey, bucket, endpoint = 'nos.netease.com', namespace = '' } = nosOptions
+    const nosClient = new NosClient({
+      accessKey: accessId,
+      accessSecret: secretKey,
+      endpoint: `https://${endpoint}`,
+      defaultBucket: bucket
+    })
     this._nosClient = nosClient
     this._bucket = bucket
     this._file = file
@@ -19,23 +21,15 @@ class NosUploadTask extends Task {
 
   upload () {
     return new Promise((resolve, reject) => {
-      const putCallback = result => {
-        if (result.statusCode !== 200) {
-          console.error(`upload to nos fail , because ${result}`)
-          return reject(result)
-        }
-        resolve(result)
-      }
       try {
-        const map = {
-          bucket: this._bucket,
-          filepath: this._file.path,
-          key: normalizeObjectKey(`${this._namespace}/${this._file.relative}`)
-        }
-        // 最大为 100M
-        this._nosClient.put_file(map, putCallback)
+        const stream = fs.createReadStream(this._file.path)
+        const data = this._nosClient.putObject({
+          body: stream,
+          objectKey: normalizeObjectKey(`${this._namespace}/${this._file.relative}`)
+        })
+        resolve(data)
       } catch (error) {
-        console.error(`nos instance init fail , because ${error}`)
+        console.error(`upload to nos fail, because ${error}`)
         reject(error)
       }
     })

package/src/vite.js

@@ -1,3 +1,4 @@
+const fetch = require('node-fetch')
 const { getFiles } = require('./utils')
 const { TaskDispatcher } = require('./task')
 const NosUploadTask = require('./adaptor/nos')
@@ -16,7 +17,7 @@ const NosUploadTask = require('./adaptor/nos')
  * @returns
  */
 function CdnUploadVitePlugin (options) {
-  const { dirs, includeRootDir, ignores, client, parallelCount } = options
+  const { dirs, includeRootDir, ignores, client, parallelCount, domain = 'https://yidunfe.nosdn.127.net' } = options
   return {
     name: 'vite-plugin-cdn-upload',
     closeBundle () {
@@ -24,13 +25,19 @@ function CdnUploadVitePlugin (options) {
       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')
+          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('CdnUploadWebpackPlugin: assets uploading ...')
+        console.log('CdnUploadVitePlugin: assets uploading ...')
         taskDispatcher.dispatch(parallelCount)
       })
     }