pubo-node 1.0.141 → 1.0.143

package/lib/file-system/index.js

@@ -31,37 +31,6 @@ var __importStar = this && this.__importStar || function (mod) {
   __setModuleDefault(result, mod);
   return result;
 };
-var __read = this && this.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-  return ar;
-};
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -69,25 +38,23 @@ exports.PuboFileSystem = void 0;
 var fs = __importStar(require("fs"));
 var callbackToPromise = function callbackToPromise(fn) {
   return function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-      args[_i] = arguments[_i];
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
     return new Promise(function (resolve, reject) {
-      fn.apply(void 0, __spreadArray(__spreadArray([], __read(args), false), [function (err) {
-        var rest = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-          rest[_i - 1] = arguments[_i];
-        }
+      fn.apply(void 0, args.concat([function (err) {
         if (err) {
           reject(err);
         }
+        for (var _len2 = arguments.length, rest = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+          rest[_key2 - 1] = arguments[_key2];
+        }
         if (rest.length < 2) {
           resolve(rest[0]);
         } else {
-          resolve(__spreadArray([], __read(rest), false));
+          resolve([].concat(rest));
         }
-      }], false));
+      }]));
     });
   };
 };

package/lib/ftp-client/index.js

@@ -1,184 +1,65 @@
 "use strict";
 
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
+var _excluded = ["driver"],
+  _excluded2 = ["maxConnection"];
+function _await(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
   }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-var __generator = this && this.__generator || function (thisArg, body) {
-  var _ = {
-      label: 0,
-      sent: function sent() {
-        if (t[0] & 1) throw t[1];
-        return t[1];
-      },
-      trys: [],
-      ops: []
-    },
-    f,
-    y,
-    t,
-    g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
   }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (g && (g = 0, op[0] && (_ = 0)), _) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0:
-        case 1:
-          t = op;
-          break;
-        case 4:
-          _.label++;
-          return {
-            value: op[1],
-            done: false
-          };
-        case 5:
-          _.label++;
-          y = op[1];
-          op = [0];
-          continue;
-        case 7:
-          op = _.ops.pop();
-          _.trys.pop();
-          continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-            _ = 0;
-            continue;
-          }
-          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-            _.label = op[1];
-            break;
-          }
-          if (op[0] === 6 && _.label < t[1]) {
-            _.label = t[1];
-            t = op;
-            break;
-          }
-          if (t && _.label < t[2]) {
-            _.label = t[2];
-            _.ops.push(op);
-            break;
-          }
-          if (t[2]) _.ops.pop();
-          _.trys.pop();
-          continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) {
-      op = [6, e];
-      y = 0;
-    } finally {
-      f = t = 0;
-    }
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
+  return then ? value.then(then) : value;
+}
+function _invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
   }
-};
-var __rest = this && this.__rest || function (s, e) {
-  var t = {};
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  return then(result);
+}
+function _empty() {}
+function _awaitIgnored(value, direct) {
+  if (!direct) {
+    return value && value.then ? value.then(_empty) : Promise.resolve();
   }
-  return t;
-};
-var __read = this && this.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
+}
+function _async(f) {
+  return function () {
+    for (var args = [], i = 0; i < arguments.length; i++) {
+      args[i] = arguments[i];
     }
-  }
-  return ar;
-};
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
+    try {
+      return Promise.resolve(f.apply(this, args));
+    } catch (e) {
+      return Promise.reject(e);
     }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
+  };
+}
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FtpClientPool = exports.FtpClient = void 0;
 var pubo_utils_1 = require("pubo-utils");
-var FtpClient = /** @class */function () {
-  function FtpClient(_a) {
-    var driver = _a.driver,
-      options = __rest(_a, ["driver"]);
+var FtpClient = /*#__PURE__*/function () {
+  function FtpClient(_ref) {
+    var driver = _ref.driver,
+      options = _objectWithoutPropertiesLoose(_ref, _excluded);
+    this.driver = void 0;
+    this.options = void 0;
     this.state = {
       running: false,
       connected: false,
       destroyed: false,
       connecting: false
     };
+    this.client = void 0;
     this._len = 0;
     this.id = (0, pubo_utils_1.random)();
     this.put = this.bind('put');
@@ -188,171 +69,156 @@ var FtpClient = /** @class */function () {
     this.driver = driver;
     this.options = options;
   }
-  Object.defineProperty(FtpClient.prototype, "len", {
-    get: function get() {
-      return this._len;
-    },
-    set: function set(n) {
-      this._len = n;
-      if (this._len < 1) {
-        this.close();
-      }
-    },
-    enumerable: false,
-    configurable: true
-  });
-  FtpClient.prototype.connect = function () {
-    return __awaiter(this, void 0, void 0, function () {
+  var _proto = FtpClient.prototype;
+  _proto.connect = function connect() {
+    try {
+      var _exit = false;
       var _this = this;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!this.client) {
-              this.client = new this.driver();
-            }
-            this.state.destroyed = false;
-            if (!this.state.connecting) return [3 /*break*/, 2];
-            return [4 /*yield*/, (0, pubo_utils_1.waitFor)(function () {
-              return _this.state.connected;
-            }, {
-              checkTime: 1000,
-              timeout: 10000
-            })];
-          case 1:
-            _a.sent();
-            return [2 /*return*/, 'connected'];
-          case 2:
-            this.state.connecting = true;
-            return [2 /*return*/, new Promise(function (resolve, reject) {
-              _this.client.once('ready', function () {
-                _this.state.connected = true;
-                resolve('connected');
-                _this.state.connecting = false;
-              });
-              _this.client.once('error', function (err) {
-                reject(err);
-                _this.close();
-              });
-              _this.client.connect(__assign({}, _this.options));
-            })];
+      if (!_this.client) {
+        _this.client = new _this.driver();
+      }
+      _this.state.destroyed = false;
+      return _await(_invoke(function () {
+        if (_this.state.connecting) {
+          return _await((0, pubo_utils_1.waitFor)(function () {
+            return _this.state.connected;
+          }, {
+            checkTime: 1000,
+            timeout: 10000
+          }), function () {
+            _exit = true;
+            return 'connected';
+          });
         }
-      });
-    });
+      }, function (_result) {
+        if (_exit) return _result;
+        _this.state.connecting = true;
+        return new Promise(function (resolve, reject) {
+          _this.client.once('ready', function () {
+            _this.state.connected = true;
+            resolve('connected');
+            _this.state.connecting = false;
+          });
+          _this.client.once('error', function (err) {
+            reject(err);
+            _this.close();
+          });
+          _this.client.connect(_extends({}, _this.options));
+        });
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
   };
-  FtpClient.prototype.close = function () {
+  _proto.close = function close() {
     this.client.end();
     this.state.connected = false;
     this.state.destroyed = true;
     this.state.connecting = false;
     this.client = null;
   };
-  FtpClient.prototype.run = function (_a) {
-    var fn = _a.fn,
-      args = _a.args;
-    return __awaiter(this, void 0, void 0, function () {
-      var _this = this;
-      return __generator(this, function (_b) {
-        switch (_b.label) {
-          case 0:
-            this.len += 1;
-            if (!!this.state.connected) return [3 /*break*/, 2];
-            return [4 /*yield*/, this.connect()];
-          case 1:
-            _b.sent();
-            _b.label = 2;
-          case 2:
-            if (!this.state.running) return [3 /*break*/, 4];
-            return [4 /*yield*/, (0, pubo_utils_1.waitFor)(function () {
-              return !_this.state.running;
+  _proto.run = function run(_ref2) {
+    var fn = _ref2.fn,
+      args = _ref2.args;
+    try {
+      var _this2 = this;
+      _this2.len += 1;
+      return _await(_invoke(function () {
+        if (!_this2.state.connected) {
+          return _awaitIgnored(_this2.connect());
+        }
+      }, function () {
+        return _invoke(function () {
+          if (_this2.state.running) {
+            return _awaitIgnored((0, pubo_utils_1.waitFor)(function () {
+              return !_this2.state.running;
             }, {
               checkTime: 1000,
               timeout: 6000000
-            })];
-          case 3:
-            _b.sent();
-            _b.label = 4;
-          case 4:
-            this.state.running = true;
-            return [2 /*return*/, new Promise(function (resolve, reject) {
-              var _a;
-              (_a = _this.client)[fn].apply(_a, __spreadArray(__spreadArray([], __read(args), false), [function (err, res) {
-                if (err) {
-                  reject(err);
-                } else {
-                  resolve(res);
-                }
-              }], false));
-            })];
-        }
+            }));
+          }
+        }, function () {
+          _this2.state.running = true;
+          return new Promise(function (resolve, reject) {
+            var _this2$client;
+            (_this2$client = _this2.client)[fn].apply(_this2$client, args.concat([function (err, res) {
+              if (err) {
+                reject(err);
+              } else {
+                resolve(res);
+              }
+            }]));
+          });
+        });
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  _proto.bind = function bind(fn) {
+    var _this3 = this;
+    return _async(function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return _await(_this3.run({
+        fn: fn,
+        args: args
+      }), function (res) {
+        _this3.state.running = false;
+        _this3.len -= 1;
+        return res;
       });
     });
   };
-  FtpClient.prototype.bind = function (fn) {
-    var _this = this;
-    return function () {
-      var args = [];
-      for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+  _proto.get = function get() {
+    try {
+      var _this4 = this;
+      var res = Buffer.alloc(0);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
-      return __awaiter(_this, void 0, void 0, function () {
-        var res;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              return [4 /*yield*/, this.run({
-                fn: fn,
-                args: args
-              })];
-            case 1:
-              res = _a.sent();
-              this.state.running = false;
-              this.len -= 1;
-              return [2 /*return*/, res];
-          }
+      return _await(_this4.run({
+        fn: 'get',
+        args: args
+      }), function (stream) {
+        return new Promise(function (resolve) {
+          stream.on('data', function (chunk) {
+            res = Buffer.concat([res, chunk], res.byteLength + chunk.byteLength);
+          });
+          stream.on('end', function () {
+            resolve(res);
+            _this4.state.running = false;
+            _this4.len -= 1;
+          });
         });
       });
-    };
-  };
-  FtpClient.prototype.get = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-      args[_i] = arguments[_i];
+    } catch (e) {
+      return Promise.reject(e);
     }
-    return __awaiter(this, void 0, void 0, function () {
-      var res, stream;
-      var _this = this;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            res = Buffer.alloc(0);
-            return [4 /*yield*/, this.run({
-              fn: 'get',
-              args: args
-            })];
-          case 1:
-            stream = _a.sent();
-            return [2 /*return*/, new Promise(function (resolve) {
-              stream.on('data', function (chunk) {
-                res = Buffer.concat([res, chunk], res.byteLength + chunk.byteLength);
-              });
-              stream.on('end', function () {
-                resolve(res);
-                _this.state.running = false;
-                _this.len -= 1;
-              });
-            })];
-        }
-      });
-    });
   };
+  _createClass(FtpClient, [{
+    key: "len",
+    get: function get() {
+      return this._len;
+    },
+    set: function set(n) {
+      this._len = n;
+      if (this._len < 1) {
+        this.close();
+      }
+    }
+  }]);
   return FtpClient;
 }();
 exports.FtpClient = FtpClient;
-var FtpClientPool = /** @class */function () {
-  function FtpClientPool(_a) {
-    var _b = _a.maxConnection,
-      maxConnection = _b === void 0 ? 5 : _b,
-      options = __rest(_a, ["maxConnection"]);
+var FtpClientPool = /*#__PURE__*/function () {
+  function FtpClientPool(_ref3) {
+    var _ref3$maxConnection = _ref3.maxConnection,
+      maxConnection = _ref3$maxConnection === void 0 ? 5 : _ref3$maxConnection,
+      options = _objectWithoutPropertiesLoose(_ref3, _excluded2);
+    this.options = void 0;
+    this.maxConnection = void 0;
     this.pool = [];
     this.get = this.bind('get');
     this.put = this.bind('put');
@@ -362,14 +228,29 @@ var FtpClientPool = /** @class */function () {
     this.options = options;
     this.maxConnection = maxConnection;
   }
-  Object.defineProperty(FtpClientPool.prototype, "len", {
+  var _proto2 = FtpClientPool.prototype;
+  _proto2.bind = function bind(fn) {
+    var _this5 = this;
+    return _async(function () {
+      var client = _this5.client;
+      return _await(client[fn].apply(client, arguments), function (res) {
+        if (client.len < 1) {
+          var index = _this5.pool.findIndex(function (item) {
+            return item.id === client.id;
+          });
+          _this5.pool.splice(index, 1);
+        }
+        return res;
+      });
+    });
+  };
+  _createClass(FtpClientPool, [{
+    key: "len",
     get: function get() {
       return this.pool.length;
-    },
-    enumerable: false,
-    configurable: true
-  });
-  Object.defineProperty(FtpClientPool.prototype, "client", {
+    }
+  }, {
+    key: "client",
     get: function get() {
       if (this.pool.length < this.maxConnection) {
         var client = new FtpClient(this.options);
@@ -380,38 +261,8 @@ var FtpClientPool = /** @class */function () {
         return a.len - b.len;
       });
       return this.pool[0];
-    },
-    enumerable: false,
-    configurable: true
-  });
-  FtpClientPool.prototype.bind = function (fn) {
-    var _this = this;
-    return function () {
-      var args = [];
-      for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-      }
-      return __awaiter(_this, void 0, void 0, function () {
-        var client, res, index;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              client = this.client;
-              return [4 /*yield*/, client[fn].apply(client, __spreadArray([], __read(args), false))];
-            case 1:
-              res = _a.sent();
-              if (client.len < 1) {
-                index = this.pool.findIndex(function (item) {
-                  return item.id === client.id;
-                });
-                this.pool.splice(index, 1);
-              }
-              return [2 /*return*/, res];
-          }
-        });
-      });
-    };
-  };
+    }
+  }]);
   return FtpClientPool;
 }();
 exports.FtpClientPool = FtpClientPool;