Merge pull request #1457 from pan93412/refactor/dynamic-to-main

refactor: allow using server statically

main.js

@@ -0,0 +1,34 @@
+const fs = require('fs')
+const path = require('path')
+const { cookieToJson } = require('./util')
+const request = require('./util/request')
+
+/** @type {Record<string, any>} */
+let obj = {}
+fs.readdirSync(path.join(__dirname, 'module'))
+  .reverse()
+  .forEach((file) => {
+    if (!file.endsWith('.js')) return
+    let fileModule = require(path.join(__dirname, 'module', file))
+    let fn = file.split('.').shift() || ''
+    obj[fn] = function (data) {
+      if (typeof data.cookie === 'string') {
+        data.cookie = cookieToJson(data.cookie)
+      }
+      return fileModule(
+        {
+          ...data,
+          cookie: data.cookie ? data.cookie : {},
+        },
+        request,
+      )
+    }
+  })
+
+/**
+ * @type {Record<string, any> & import("./server")}
+ */
+module.exports = {
+  ...require('./server'),
+  ...obj,
+}

main.test.js

@@ -0,0 +1,18 @@
+const assert = require('assert')
+const main = require('./main')
+
+describe('methods in server.js', () => {
+  it('has serveNcmApi', () => {
+    assert.strictEqual(typeof main.serveNcmApi, 'function')
+  })
+
+  it('has getModulesDefinitions', () => {
+    assert.strictEqual(typeof main.getModulesDefinitions, 'function')
+  })
+})
+
+describe('methods in module', () => {
+  it('has activate_init_profile', () => {
+    assert.strictEqual(typeof main.activate_init_profile, 'function')
+  })
+})

package.json

@@ -4,7 +4,7 @@
   "description": "网易云音乐 NodeJS 版 API",
   "scripts": {
     "start": "node app.js",
-    "test": "mocha -r intelli-espower-loader -t 20000 server.test.js --exit",
+    "test": "mocha -r intelli-espower-loader -t 20000 server.test.js main.test.js --exit",
     "lint": "eslint \"**/*.{js,ts}\"",
     "lint-fix": "eslint --fix \"**/*.{js,ts}\"",
     "prepare": "husky install",
@@ -26,7 +26,7 @@
     "音乐",
     "网易云音乐nodejs"
   ],
-  "main": "server.js",
+  "main": "main.js",
   "types": "./interface.d.ts",
   "engines": {
     "node": ">=12"
@@ -78,4 +78,4 @@
     "prettier": "2.5.1",
     "typescript": "4.5.2"
   }
-}
+}

server.js

@@ -294,28 +294,7 @@ async function serveNcmApi(options) {
   return appExt
 }
 
-let obj = {}
-fs.readdirSync(path.join(__dirname, 'module'))
-  .reverse()
-  .forEach((file) => {
-    if (!file.endsWith('.js')) return
-    let fileModule = require(path.join(__dirname, 'module', file))
-    obj[file.split('.').shift()] = function (data) {
-      if (typeof data.cookie === 'string') {
-        data.cookie = cookieToJson(data.cookie)
-      }
-      return fileModule(
-        {
-          ...data,
-          cookie: data.cookie ? data.cookie : {},
-        },
-        request,
-      )
-    }
-  })
-
 module.exports = {
   serveNcmApi,
   getModulesDefinitions,
-  ...obj,
 }