@qse/edu-scripts 1.14.10 → 1.14.11

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新日志
 
+## 1.14.11 (2025-05-12)
+
+- feat: 优化热更新能力，适配 v1 环境
+
 ## 1.14.10 (2025-05-08)
 
 - feat: 部署增加文曲智阅（钉钉一方化）

package/lib/config/plugins/ws-utils-createSocketURL.js

@@ -0,0 +1,118 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/config/plugins/ws-utils-createSocketURL.js
+var ws_utils_createSocketURL_exports = {};
+__export(ws_utils_createSocketURL_exports, {
+  default: () => ws_utils_createSocketURL_default
+});
+module.exports = __toCommonJS(ws_utils_createSocketURL_exports);
+function format(objURL) {
+  var protocol = objURL.protocol || "";
+  if (protocol && protocol.substr(-1) !== ":") {
+    protocol += ":";
+  }
+  var auth = objURL.auth || "";
+  if (auth) {
+    auth = encodeURIComponent(auth);
+    auth = auth.replace(/%3A/i, ":");
+    auth += "@";
+  }
+  var host = "";
+  if (objURL.hostname) {
+    host = auth + (objURL.hostname.indexOf(":") === -1 ? objURL.hostname : "[".concat(objURL.hostname, "]"));
+    if (objURL.port) {
+      host += ":".concat(objURL.port);
+    }
+  }
+  var pathname = objURL.pathname || "";
+  if (objURL.slashes) {
+    host = "//".concat(host || "");
+    if (pathname && pathname.charAt(0) !== "/") {
+      pathname = "/".concat(pathname);
+    }
+  } else if (!host) {
+    host = "";
+  }
+  var search = objURL.search || "";
+  if (search && search.charAt(0) !== "?") {
+    search = "?".concat(search);
+  }
+  var hash = objURL.hash || "";
+  if (hash && hash.charAt(0) !== "#") {
+    hash = "#".concat(hash);
+  }
+  pathname = pathname.replace(
+    /[?#]/g,
+    /**
+     * @param {string} match
+     * @returns {string}
+     */
+    function(match) {
+      return encodeURIComponent(match);
+    }
+  );
+  search = search.replace("#", "%23");
+  return "".concat(protocol).concat(host).concat(pathname).concat(search).concat(hash);
+}
+function createSocketURL(parsedURL) {
+  var hostname = parsedURL.hostname;
+  var isInAddrAny = hostname === "0.0.0.0" || hostname === "::" || hostname === "[::]";
+  if (isInAddrAny && self.location.hostname && self.location.protocol.indexOf("http") === 0) {
+    hostname = self.location.hostname;
+  }
+  var socketURLProtocol = parsedURL.protocol || self.location.protocol;
+  if (socketURLProtocol === "auto:" || hostname && isInAddrAny && self.location.protocol === "https:") {
+    socketURLProtocol = self.location.protocol;
+  }
+  socketURLProtocol = socketURLProtocol.replace(/^(?:http|.+-extension|file)/i, "ws");
+  var socketURLAuth = "";
+  if (parsedURL.username) {
+    socketURLAuth = parsedURL.username;
+    if (parsedURL.password) {
+      socketURLAuth = socketURLAuth.concat(":", parsedURL.password);
+    }
+  }
+  var socketURLHostname = (hostname || self.location.hostname || "localhost").replace(
+    /^\[(.*)\]$/,
+    "$1"
+  );
+  var socketURLPort = parsedURL.port;
+  if (!socketURLPort || socketURLPort === "0") {
+    socketURLPort = self.location.port;
+  }
+  var socketURLPathname = "/ws";
+  if (parsedURL.pathname && !parsedURL.fromCurrentScript) {
+    socketURLPathname = parsedURL.pathname;
+    if (hostname.indexOf("zhidianbao.cn") > -1 || hostname.indexOf("qsban.cn") > -1) {
+      var ctx = self.location.pathname.split("/")[1];
+      if (ctx) {
+        socketURLPathname = "/" + ctx + socketURLPathname;
+      }
+    }
+  }
+  return format({
+    protocol: socketURLProtocol,
+    auth: socketURLAuth,
+    hostname: socketURLHostname,
+    port: socketURLPort,
+    pathname: socketURLPathname,
+    slashes: true
+  });
+}
+var ws_utils_createSocketURL_default = createSocketURL;

package/lib/config/webpackConfig.js

@@ -1,3 +1,26 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
 // src/config/webpackConfig.js
 var fs = require("fs");
 var webpack = require("webpack");
@@ -318,6 +341,11 @@ module.exports = function getWebpackConfig(args, override) {
       qseCDN.isUseCommon && new webpack.DllReferencePlugin({
         manifest: require("../asset/dll/libcommon3-manifest.json")
       }),
+      new webpack.NormalModuleReplacementPlugin(/createSocketURL\.js$/, (resource) => {
+        if (resource.context.includes("webpack-dev-server")) {
+          resource.request = require.resolve("./plugins/ws-utils-createSocketURL");
+        }
+      }),
       new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/
@@ -327,8 +355,6 @@ module.exports = function getWebpackConfig(args, override) {
         "process.env.APP_VERSION": JSON.stringify(appPkg.version),
         "process.env.BABEL_ENV": JSON.stringify(process.env.BABEL_ENV),
         "process.env.BROWSERSLIST": JSON.stringify(process.env.BROWSERSLIST),
-        "process.env.WDS_SOCKET_HOST": JSON.stringify(process.env.WDS_SOCKET_HOST),
-        "process.env.WDS_SOCKET_PORT": JSON.stringify(process.env.WDS_SOCKET_PORT),
         ...override.define
       }),
       new webpack.ProgressPlugin(),

package/lib/config/webpackDevServerConfig.js

@@ -3,8 +3,6 @@ var WebpackDevServer = require("webpack-dev-server");
 var setupMockServer = require("./plugins/mock-server");
 module.exports = function getWebpackDevServerConfig(args, override) {
   const host = process.env.HOST || "0.0.0.0";
-  const sockHost = process.env.WDS_SOCKET_HOST;
-  const sockPort = process.env.WDS_SOCKET_PORT;
   const devServer = {
     hot: true,
     allowedHosts: "all",
@@ -13,7 +11,7 @@ module.exports = function getWebpackDevServerConfig(args, override) {
     open: args.open,
     host,
     client: {
-      webSocketURL: { protocol: "auto:", hostname: sockHost, port: sockPort },
+      webSocketURL: "auto://0.0.0.0:0/ws",
       overlay: {
         runtimeErrors: false,
         errors: true,

package/lib/start.js

@@ -10,14 +10,12 @@ var WebpackDevServer = require("webpack-dev-server");
 var webpack = require("webpack");
 var getConfig = require("./utils/getConfig");
 var chalk = require("chalk");
-process.env.WDS_SOCKET_HOST = WebpackDevServer.internalIPSync("v4") || "127.0.0.1";
 module.exports = async function start(args) {
   const basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT;
   const port = await WebpackDevServer.getFreePort(args.port || process.env.PORT);
   if (!(args.port || process.env.PORT) && +port !== +basePort) {
     console.log(chalk.bgYellow(`${basePort} 端口已被占用，现切换到 ${port} 端口运行`));
   }
-  process.env.WDS_SOCKET_PORT = port;
   args.port = port;
   process.env.PORT = port;
   const compiler = webpack(getConfig(args));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "1.14.10",
+  "version": "1.14.11",
   "author": "Kinoko",
   "license": "MIT",
   "description": "教育工程化基础框架",

package/src/config/plugins/ws-utils-createSocketURL.js

@@ -0,0 +1,140 @@
+/* eslint-disable no-restricted-globals */
+
+/**
+ * @param {{ protocol?: string, auth?: string, hostname?: string, port?: string, pathname?: string, search?: string, hash?: string, slashes?: boolean }} objURL
+ * @returns {string}
+ */
+function format(objURL) {
+  var protocol = objURL.protocol || ''
+  if (protocol && protocol.substr(-1) !== ':') {
+    protocol += ':'
+  }
+  var auth = objURL.auth || ''
+  if (auth) {
+    auth = encodeURIComponent(auth)
+    auth = auth.replace(/%3A/i, ':')
+    auth += '@'
+  }
+  var host = ''
+  if (objURL.hostname) {
+    host =
+      auth +
+      (objURL.hostname.indexOf(':') === -1 ? objURL.hostname : '['.concat(objURL.hostname, ']'))
+    if (objURL.port) {
+      host += ':'.concat(objURL.port)
+    }
+  }
+  var pathname = objURL.pathname || ''
+  if (objURL.slashes) {
+    host = '//'.concat(host || '')
+    if (pathname && pathname.charAt(0) !== '/') {
+      pathname = '/'.concat(pathname)
+    }
+  } else if (!host) {
+    host = ''
+  }
+  var search = objURL.search || ''
+  if (search && search.charAt(0) !== '?') {
+    search = '?'.concat(search)
+  }
+  var hash = objURL.hash || ''
+  if (hash && hash.charAt(0) !== '#') {
+    hash = '#'.concat(hash)
+  }
+  pathname = pathname.replace(
+    /[?#]/g,
+    /**
+     * @param {string} match
+     * @returns {string}
+     */
+    function (match) {
+      return encodeURIComponent(match)
+    }
+  )
+  search = search.replace('#', '%23')
+  return ''.concat(protocol).concat(host).concat(pathname).concat(search).concat(hash)
+}
+
+/**
+ * @param {URL & { fromCurrentScript?: boolean }} parsedURL
+ * @returns {string}
+ */
+function createSocketURL(parsedURL) {
+  var hostname = parsedURL.hostname
+
+  // Node.js module parses it as `::`
+  // `new URL(urlString, [baseURLString])` parses it as '[::]'
+  var isInAddrAny = hostname === '0.0.0.0' || hostname === '::' || hostname === '[::]'
+
+  // why do we need this check?
+  // hostname n/a for file protocol (example, when using electron, ionic)
+  // see: https://github.com/webpack/webpack-dev-server/pull/384
+  if (isInAddrAny && self.location.hostname && self.location.protocol.indexOf('http') === 0) {
+    hostname = self.location.hostname
+  }
+  var socketURLProtocol = parsedURL.protocol || self.location.protocol
+
+  // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
+  if (
+    socketURLProtocol === 'auto:' ||
+    (hostname && isInAddrAny && self.location.protocol === 'https:')
+  ) {
+    socketURLProtocol = self.location.protocol
+  }
+  socketURLProtocol = socketURLProtocol.replace(/^(?:http|.+-extension|file)/i, 'ws')
+  var socketURLAuth = ''
+
+  // `new URL(urlString, [baseURLstring])` doesn't have `auth` property
+  // Parse authentication credentials in case we need them
+  if (parsedURL.username) {
+    socketURLAuth = parsedURL.username
+
+    // Since HTTP basic authentication does not allow empty username,
+    // we only include password if the username is not empty.
+    if (parsedURL.password) {
+      // Result: <username>:<password>
+      socketURLAuth = socketURLAuth.concat(':', parsedURL.password)
+    }
+  }
+
+  // In case the host is a raw IPv6 address, it can be enclosed in
+  // the brackets as the brackets are needed in the final URL string.
+  // Need to remove those as url.format blindly adds its own set of brackets
+  // if the host string contains colons. That would lead to non-working
+  // double brackets (e.g. [[::]]) host
+  //
+  // All of these web socket url params are optionally passed in through resourceQuery,
+  // so we need to fall back to the default if they are not provided
+  var socketURLHostname = (hostname || self.location.hostname || 'localhost').replace(
+    /^\[(.*)\]$/,
+    '$1'
+  )
+  var socketURLPort = parsedURL.port
+  if (!socketURLPort || socketURLPort === '0') {
+    socketURLPort = self.location.port
+  }
+
+  // If path is provided it'll be passed in via the resourceQuery as a
+  // query param so it has to be parsed out of the querystring in order for the
+  // client to open the socket to the correct location.
+  var socketURLPathname = '/ws'
+  if (parsedURL.pathname && !parsedURL.fromCurrentScript) {
+    socketURLPathname = parsedURL.pathname
+
+    if (hostname.indexOf('zhidianbao.cn') > -1 || hostname.indexOf('qsban.cn') > -1) {
+      var ctx = self.location.pathname.split('/')[1]
+      if (ctx) {
+        socketURLPathname = '/' + ctx + socketURLPathname
+      }
+    }
+  }
+  return format({
+    protocol: socketURLProtocol,
+    auth: socketURLAuth,
+    hostname: socketURLHostname,
+    port: socketURLPort,
+    pathname: socketURLPathname,
+    slashes: true,
+  })
+}
+export default createSocketURL

package/src/config/webpackConfig.js

@@ -340,6 +340,11 @@ module.exports = function getWebpackConfig(args, override) {
         new webpack.DllReferencePlugin({
           manifest: require('../asset/dll/libcommon3-manifest.json'),
         }),
+      new webpack.NormalModuleReplacementPlugin(/createSocketURL\.js$/, (resource) => {
+        if (resource.context.includes('webpack-dev-server')) {
+          resource.request = require.resolve('./plugins/ws-utils-createSocketURL')
+        }
+      }),
       new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/,
@@ -349,8 +354,6 @@ module.exports = function getWebpackConfig(args, override) {
         'process.env.APP_VERSION': JSON.stringify(appPkg.version),
         'process.env.BABEL_ENV': JSON.stringify(process.env.BABEL_ENV),
         'process.env.BROWSERSLIST': JSON.stringify(process.env.BROWSERSLIST),
-        'process.env.WDS_SOCKET_HOST': JSON.stringify(process.env.WDS_SOCKET_HOST),
-        'process.env.WDS_SOCKET_PORT': JSON.stringify(process.env.WDS_SOCKET_PORT),
         ...override.define,
       }),
       new webpack.ProgressPlugin(),

package/src/config/webpackDevServerConfig.js

@@ -7,8 +7,6 @@ const setupMockServer = require('./plugins/mock-server')
  */
 module.exports = function getWebpackDevServerConfig(args, override) {
   const host = process.env.HOST || '0.0.0.0'
-  const sockHost = process.env.WDS_SOCKET_HOST
-  const sockPort = process.env.WDS_SOCKET_PORT
 
   /** @type {WebpackDevServer.Configuration} */
   const devServer = {
@@ -19,7 +17,7 @@ module.exports = function getWebpackDevServerConfig(args, override) {
     open: args.open,
     host,
     client: {
-      webSocketURL: { protocol: 'auto:', hostname: sockHost, port: sockPort },
+      webSocketURL: 'auto://0.0.0.0:0/ws',
       overlay: {
         runtimeErrors: false,
         errors: true,

package/src/start.js

@@ -15,15 +15,12 @@ const webpack = require('webpack')
 const getConfig = require('./utils/getConfig')
 const chalk = require('chalk')
 
-process.env.WDS_SOCKET_HOST = WebpackDevServer.internalIPSync('v4') || '127.0.0.1'
-
 module.exports = async function start(args) {
   const basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT
   const port = await WebpackDevServer.getFreePort(args.port || process.env.PORT)
   if (!(args.port || process.env.PORT) && +port !== +basePort) {
     console.log(chalk.bgYellow(`${basePort} 端口已被占用，现切换到 ${port} 端口运行`))
   }
-  process.env.WDS_SOCKET_PORT = port
   args.port = port
   process.env.PORT = port