innetjs 2.6.0-alpha.5 → 2.6.0-alpha.7

package/_virtual/_rollup-plugin-process-env.js

@@ -1,7 +1,7 @@
 'use strict';
 
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.6.0-alpha.5"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.6.0-alpha.7"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/_virtual/_rollup-plugin-process-env.mjs

@@ -1,5 +1,5 @@
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.6.0-alpha.5"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.6.0-alpha.7"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/bin/innet

@@ -22,7 +22,7 @@ var glob = require('glob');
 var http = require('node:http');
 var https = require('node:https');
 var linesAndColumns = require('lines-and-columns');
-var path$1 = require('node:path');
+var path = require('node:path');
 var prompt = require('prompts');
 var rollup = require('rollup');
 var external = require('rollup-plugin-external-node-modules');
@@ -34,9 +34,10 @@ var rollupPluginPreserveShebangs = require('rollup-plugin-preserve-shebangs');
 var env = require('rollup-plugin-process-env');
 var styles = require('rollup-plugin-styles');
 var rollupPluginTerser = require('rollup-plugin-terser');
+var stream = require('node:stream');
 var tmp = require('tmp');
-var node_util = require('node:util');
 var unzipper = require('unzipper');
+var node_util = require('node:util');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -57,7 +58,7 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var glob__default = /*#__PURE__*/_interopDefaultLegacy(glob);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path$1);
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
 var rollup__default = /*#__PURE__*/_interopDefaultLegacy(rollup);
 var external__default = /*#__PURE__*/_interopDefaultLegacy(external);
@@ -67,6 +68,7 @@ var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
 var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
 var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
 var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
+var stream__default = /*#__PURE__*/_interopDefaultLegacy(stream);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 
 const lintInclude = [
@@ -97,48 +99,6 @@ const stringExcludeNode = [
     '**/*.json',
 ];
 
-const Writer = require('fstream').Writer;
-const path = require('path');
-const stream = require('stream');
-const duplexer2 = require('duplexer2');
-const Promise$1 = require('bluebird');
-function Extract(opts, template) {
-    const reduceCount = 19 + template.length;
-    // make sure path is normalized before using it
-    opts.path = path.resolve(path.normalize(opts.path));
-    // @ts-expect-error
-    const parser = new unzipper.Parse(opts);
-    const outStream = new stream.Writable({ objectMode: true });
-    outStream._write = function (entry, encoding, cb) {
-        if (entry.type === 'Directory')
-            return cb();
-        const extractPath = path.join(opts.path, entry.path.slice(reduceCount));
-        if (extractPath.indexOf(opts.path) !== 0) {
-            return cb();
-        }
-        const writer = opts.getWriter ? opts.getWriter({ path: extractPath }) : Writer({ path: extractPath });
-        entry.pipe(writer)
-            .on('error', cb)
-            .on('close', cb);
-    };
-    const extract = duplexer2(parser, outStream);
-    parser.once('crx-header', function (crxHeader) {
-        extract.crxHeader = crxHeader;
-    });
-    parser
-        .pipe(outStream)
-        .on('finish', function () {
-        extract.emit('close');
-    });
-    extract.promise = function () {
-        return new Promise$1(function (resolve, reject) {
-            extract.on('close', resolve);
-            extract.on('error', reject);
-        });
-    };
-    return extract;
-}
-
 function getFile(file) {
     file = path__default["default"].resolve(file);
     if (!fs__default["default"].existsSync(file)) {
@@ -194,6 +154,7 @@ const readline = require('readline');
 const importAssets = require('rollup-plugin-import-assets');
 const execAsync = node_util.promisify(exec);
 const copyFiles = node_util.promisify(fs__default["default"].copy);
+const pipeline = node_util.promisify(stream__default["default"].pipeline);
 updateDotenv();
 const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 const REG_RPT_ERROR_FILE = /(src[^:]+):(\d+):(\d+)/;
@@ -266,13 +227,15 @@ class InnetJS {
                 }));
             }
             yield logger__default["default"].start('Download template', () => tslib.__awaiter(this, void 0, void 0, function* () {
+                const zipPath = `${path__default["default"].join(appPath, 'template.zip')}`;
                 const { data } = yield axios__default["default"].get(`https://github.com/d8corp/innetjs-templates/archive/refs/heads/${template}.zip`, {
                     responseType: 'stream',
                 });
+                yield pipeline(data, fs__default["default"].createWriteStream(zipPath));
                 yield new Promise((resolve, reject) => {
-                    data.pipe(Extract({
-                        path: appPath,
-                    }, template)).on('finish', resolve).on('error', reject);
+                    fs__default["default"].createReadStream(zipPath)
+                        .pipe(unzipper.Extract({ path: appPath }))
+                        .on('finish', resolve).on('error', reject);
                 });
             }));
             yield logger__default["default"].start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
@@ -422,7 +385,7 @@ class InnetJS {
                 options.plugins.push(pluginNodeResolve.nodeResolve(), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer());
+                }), this.createServer(input));
             }
             else {
                 const key = path__default["default"].basename(this.sslKey) !== this.sslKey
@@ -787,21 +750,25 @@ class InnetJS {
             }),
         };
     }
-    createServer() {
-        let app;
+    createServer(input) {
+        const apps = {};
         return {
             name: 'server',
             writeBundle: () => tslib.__awaiter(this, void 0, void 0, function* () {
-                app === null || app === void 0 ? void 0 : app.kill();
-                const filePath = path__default["default"].resolve(this.devBuildFolder, 'index.js');
-                app = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                var _a;
+                for (const file of input) {
+                    const { name } = path__default["default"].parse(file);
+                    (_a = apps[name]) === null || _a === void 0 ? void 0 : _a.kill();
+                    const filePath = path__default["default"].resolve(this.devBuildFolder, `${name}.js`);
+                    apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                }
             }),
         };
     }
 }
 
 (function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.6.0-alpha.5"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.6.0-alpha.7"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/index.d.ts

@@ -72,5 +72,5 @@ export declare class InnetJS {
     increaseVersion(release: string): Promise<void>;
     getPackage(): Promise<Record<string, any>>;
     createClient(key: any, cert: any, pkg: any, index: string, inject: boolean): rollup.Plugin;
-    createServer(): rollup.Plugin;
+    createServer(input: string[]): rollup.Plugin;
 }

package/index.js

@@ -35,10 +35,11 @@ var rollupPluginPreserveShebangs = require('rollup-plugin-preserve-shebangs');
 var env = require('rollup-plugin-process-env');
 var styles = require('rollup-plugin-styles');
 var rollupPluginTerser = require('rollup-plugin-terser');
+var stream = require('node:stream');
 var tmp = require('tmp');
+var unzipper = require('unzipper');
 var node_util = require('node:util');
 var constants = require('./constants.js');
-var extract = require('./extract.js');
 var helpers = require('./helpers.js');
 var updateDotenv = require('./updateDotenv.js');
 
@@ -71,6 +72,7 @@ var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
 var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
 var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
 var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
+var stream__default = /*#__PURE__*/_interopDefaultLegacy(stream);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 
 const livereload = require('rollup-plugin-livereload');
@@ -80,6 +82,7 @@ const readline = require('readline');
 const importAssets = require('rollup-plugin-import-assets');
 const execAsync = node_util.promisify(exec);
 const copyFiles = node_util.promisify(fs__default["default"].copy);
+const pipeline = node_util.promisify(stream__default["default"].pipeline);
 updateDotenv.updateDotenv();
 const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 const REG_RPT_ERROR_FILE = /(src[^:]+):(\d+):(\d+)/;
@@ -152,13 +155,15 @@ class InnetJS {
                 }));
             }
             yield logger__default["default"].start('Download template', () => tslib.__awaiter(this, void 0, void 0, function* () {
+                const zipPath = `${path__default["default"].join(appPath, 'template.zip')}`;
                 const { data } = yield axios__default["default"].get(`https://github.com/d8corp/innetjs-templates/archive/refs/heads/${template}.zip`, {
                     responseType: 'stream',
                 });
+                yield pipeline(data, fs__default["default"].createWriteStream(zipPath));
                 yield new Promise((resolve, reject) => {
-                    data.pipe(extract.Extract({
-                        path: appPath,
-                    }, template)).on('finish', resolve).on('error', reject);
+                    fs__default["default"].createReadStream(zipPath)
+                        .pipe(unzipper.Extract({ path: appPath }))
+                        .on('finish', resolve).on('error', reject);
                 });
             }));
             yield logger__default["default"].start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
@@ -308,7 +313,7 @@ class InnetJS {
                 options.plugins.push(pluginNodeResolve.nodeResolve(), string({
                     include: '**/*.*',
                     exclude: constants.stringExcludeNode,
-                }), this.createServer());
+                }), this.createServer(input));
             }
             else {
                 const key = path__default["default"].basename(this.sslKey) !== this.sslKey
@@ -673,14 +678,18 @@ class InnetJS {
             }),
         };
     }
-    createServer() {
-        let app;
+    createServer(input) {
+        const apps = {};
         return {
             name: 'server',
             writeBundle: () => tslib.__awaiter(this, void 0, void 0, function* () {
-                app === null || app === void 0 ? void 0 : app.kill();
-                const filePath = path__default["default"].resolve(this.devBuildFolder, 'index.js');
-                app = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                var _a;
+                for (const file of input) {
+                    const { name } = path__default["default"].parse(file);
+                    (_a = apps[name]) === null || _a === void 0 ? void 0 : _a.kill();
+                    const filePath = path__default["default"].resolve(this.devBuildFolder, `${name}.js`);
+                    apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                }
             }),
         };
     }

package/index.mjs

@@ -31,10 +31,11 @@ import { preserveShebangs } from 'rollup-plugin-preserve-shebangs';
 import env from 'rollup-plugin-process-env';
 import styles from 'rollup-plugin-styles';
 import { terser } from 'rollup-plugin-terser';
+import stream from 'node:stream';
 import tmp from 'tmp';
+import { Extract } from 'unzipper';
 import { promisify } from 'node:util';
 import { stringExcludeNode, imageInclude, stringExcludeDom, lintInclude } from './constants.mjs';
-import { Extract } from './extract.mjs';
 import { reporter, convertIndexFile, getFile } from './helpers.mjs';
 import { updateDotenv } from './updateDotenv.mjs';
 
@@ -45,6 +46,7 @@ const readline = require('readline');
 const importAssets = require('rollup-plugin-import-assets');
 const execAsync = promisify(exec);
 const copyFiles = promisify(fs.copy);
+const pipeline = promisify(stream.pipeline);
 updateDotenv();
 const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 const REG_RPT_ERROR_FILE = /(src[^:]+):(\d+):(\d+)/;
@@ -117,13 +119,15 @@ class InnetJS {
                 }));
             }
             yield logger.start('Download template', () => __awaiter(this, void 0, void 0, function* () {
+                const zipPath = `${path.join(appPath, 'template.zip')}`;
                 const { data } = yield axios.get(`https://github.com/d8corp/innetjs-templates/archive/refs/heads/${template}.zip`, {
                     responseType: 'stream',
                 });
+                yield pipeline(data, fs.createWriteStream(zipPath));
                 yield new Promise((resolve, reject) => {
-                    data.pipe(Extract({
-                        path: appPath,
-                    }, template)).on('finish', resolve).on('error', reject);
+                    fs.createReadStream(zipPath)
+                        .pipe(Extract({ path: appPath }))
+                        .on('finish', resolve).on('error', reject);
                 });
             }));
             yield logger.start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
@@ -273,7 +277,7 @@ class InnetJS {
                 options.plugins.push(nodeResolve(), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer());
+                }), this.createServer(input));
             }
             else {
                 const key = path.basename(this.sslKey) !== this.sslKey
@@ -638,14 +642,18 @@ class InnetJS {
             }),
         };
     }
-    createServer() {
-        let app;
+    createServer(input) {
+        const apps = {};
         return {
             name: 'server',
             writeBundle: () => __awaiter(this, void 0, void 0, function* () {
-                app === null || app === void 0 ? void 0 : app.kill();
-                const filePath = path.resolve(this.devBuildFolder, 'index.js');
-                app = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                var _a;
+                for (const file of input) {
+                    const { name } = path.parse(file);
+                    (_a = apps[name]) === null || _a === void 0 ? void 0 : _a.kill();
+                    const filePath = path.resolve(this.devBuildFolder, `${name}.js`);
+                    apps[name] = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
+                }
             }),
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.6.0-alpha.5",
+  "version": "2.6.0-alpha.7",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",

package/extract.d.ts

@@ -1 +0,0 @@
-export declare function Extract(opts: any, template: any): any;

package/extract.js

@@ -1,49 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var unzipper = require('unzipper');
-
-const Writer = require('fstream').Writer;
-const path = require('path');
-const stream = require('stream');
-const duplexer2 = require('duplexer2');
-const Promise$1 = require('bluebird');
-function Extract(opts, template) {
-    const reduceCount = 19 + template.length;
-    // make sure path is normalized before using it
-    opts.path = path.resolve(path.normalize(opts.path));
-    // @ts-expect-error
-    const parser = new unzipper.Parse(opts);
-    const outStream = new stream.Writable({ objectMode: true });
-    outStream._write = function (entry, encoding, cb) {
-        if (entry.type === 'Directory')
-            return cb();
-        const extractPath = path.join(opts.path, entry.path.slice(reduceCount));
-        if (extractPath.indexOf(opts.path) !== 0) {
-            return cb();
-        }
-        const writer = opts.getWriter ? opts.getWriter({ path: extractPath }) : Writer({ path: extractPath });
-        entry.pipe(writer)
-            .on('error', cb)
-            .on('close', cb);
-    };
-    const extract = duplexer2(parser, outStream);
-    parser.once('crx-header', function (crxHeader) {
-        extract.crxHeader = crxHeader;
-    });
-    parser
-        .pipe(outStream)
-        .on('finish', function () {
-        extract.emit('close');
-    });
-    extract.promise = function () {
-        return new Promise$1(function (resolve, reject) {
-            extract.on('close', resolve);
-            extract.on('error', reject);
-        });
-    };
-    return extract;
-}
-
-exports.Extract = Extract;

package/extract.mjs

@@ -1,45 +0,0 @@
-import { Parse } from 'unzipper';
-
-const Writer = require('fstream').Writer;
-const path = require('path');
-const stream = require('stream');
-const duplexer2 = require('duplexer2');
-const Promise$1 = require('bluebird');
-function Extract(opts, template) {
-    const reduceCount = 19 + template.length;
-    // make sure path is normalized before using it
-    opts.path = path.resolve(path.normalize(opts.path));
-    // @ts-expect-error
-    const parser = new Parse(opts);
-    const outStream = new stream.Writable({ objectMode: true });
-    outStream._write = function (entry, encoding, cb) {
-        if (entry.type === 'Directory')
-            return cb();
-        const extractPath = path.join(opts.path, entry.path.slice(reduceCount));
-        if (extractPath.indexOf(opts.path) !== 0) {
-            return cb();
-        }
-        const writer = opts.getWriter ? opts.getWriter({ path: extractPath }) : Writer({ path: extractPath });
-        entry.pipe(writer)
-            .on('error', cb)
-            .on('close', cb);
-    };
-    const extract = duplexer2(parser, outStream);
-    parser.once('crx-header', function (crxHeader) {
-        extract.crxHeader = crxHeader;
-    });
-    parser
-        .pipe(outStream)
-        .on('finish', function () {
-        extract.emit('close');
-    });
-    extract.promise = function () {
-        return new Promise$1(function (resolve, reject) {
-            extract.on('close', resolve);
-            extract.on('error', reject);
-        });
-    };
-    return extract;
-}
-
-export { Extract };