@hot-updater/react-native 0.0.2 → 0.0.4

package/ios/HotUpdater/HotUpdater.mm

@@ -132,8 +132,10 @@ static NSURL *_bundleURL = nil;
         dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
     }
     
-    [self setVersionId:prefix];
-    NSLog(@"Downloaded all files.");
+    if (allSuccess) {
+        [self setVersionId:prefix];
+        NSLog(@"Downloaded all files.");
+    }
     return allSuccess;
 }
 
@@ -147,7 +149,6 @@ RCT_EXPORT_METHOD(getAppVersionId:(RCTResponseSenderBlock)callback) {
 RCT_EXPORT_METHOD(downloadFilesFromURLs:(NSArray<NSString *> *)urlStrings prefix:(NSString *)prefix callback:(RCTResponseSenderBlock)callback) {
     NSMutableArray<NSURL *> *urls = [NSMutableArray array];
     for (NSString *urlString in urlStrings) {
-        NSLog(@"urlString: %@", urlString);
         NSURL *url = [NSURL URLWithString:urlString];
 
         if (url) {

package/lib/error.d.ts

@@ -0,0 +1,4 @@
+export declare class HotUpdaterError extends Error {
+    constructor(message: string);
+}
+//# sourceMappingURL=error.d.ts.map

package/lib/error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,OAAO,EAAE,MAAM;CAI5B"}

package/lib/error.js

@@ -0,0 +1,25 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var HotUpdaterError = /** @class */ (function (_super) {
+    __extends(HotUpdaterError, _super);
+    function HotUpdaterError(message) {
+        var _this = _super.call(this, message) || this;
+        _this.name = "HotUpdaterError";
+        return _this;
+    }
+    return HotUpdaterError;
+}(Error));
+export { HotUpdaterError };

package/lib/index.d.ts

@@ -15,12 +15,11 @@ export declare const getAppVersionId: () => Promise<string | null>;
  * @returns {Promise<boolean>} Resolves with true if download was successful, otherwise rejects with an error.
  */
 export declare const downloadFilesFromURLs: (urlStrings: string[], prefix: string) => Promise<boolean>;
-export type HotUpdaterContext = {
-    ios: string;
-    android: string;
-} | string;
+export type HotUpdaterStatus = "INSTALLING_UPDATE" | "UP_TO_DATE";
 export interface HotUpdaterInit {
     metadata: HotUpdaterMetaData | (() => HotUpdaterMetaData) | (() => Promise<HotUpdaterMetaData>);
+    onSuccess?: (status: HotUpdaterStatus) => void;
+    onFailure?: (e: unknown) => void;
 }
-export declare const init: ({ metadata }: HotUpdaterInit) => Promise<void>;
+export declare const init: ({ metadata, onSuccess, onFailure, }: HotUpdaterInit) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI7C;;;;;GAKG;AACH,eAAO,MAAM,eAAe,QAAa,QAAQ,MAAM,GAAG,IAAI,CAM7D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,eACpB,MAAM,EAAE,UACZ,MAAM,KACb,QAAQ,OAAO,CAMjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB;IACE,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB,GACD,MAAM,CAAC;AAEX,MAAM,WAAW,cAAc;IAC7B,QAAQ,EACJ,kBAAkB,GAClB,CAAC,MAAM,kBAAkB,CAAC,GAC1B,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;CACzC;AAED,eAAO,MAAM,IAAI,iBAAwB,cAAc,kBAYtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAM7C;;;;;GAKG;AACH,eAAO,MAAM,eAAe,QAAa,QAAQ,MAAM,GAAG,IAAI,CAM7D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,eACpB,MAAM,EAAE,UACZ,MAAM,KACb,QAAQ,OAAO,CAqBjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG,YAAY,CAAC;AAElE,MAAM,WAAW,cAAc;IAC7B,QAAQ,EACJ,kBAAkB,GAClB,CAAC,MAAM,kBAAkB,CAAC,GAC1B,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAExC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAClC;AAED,eAAO,MAAM,IAAI,wCAId,cAAc,kBA+BhB,CAAC"}

package/lib/index.js

@@ -34,7 +34,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+import { URL } from "react-native-url-polyfill";
 import { NativeModules, Platform } from "react-native";
+import { HotUpdaterError } from "./error";
+import { wrapNetworkError } from "./wrapNetworkError";
 var HotUpdater = NativeModules.HotUpdater;
 /**
  * Fetches the current app version id.
@@ -61,40 +64,69 @@ export var getAppVersionId = function () { return __awaiter(void 0, void 0, void
  */
 export var downloadFilesFromURLs = function (urlStrings, prefix) {
     return new Promise(function (resolve) {
-        HotUpdater.downloadFilesFromURLs(urlStrings, prefix, function (success) {
+        var encodedURLs = urlStrings.map(function (urlString) {
+            var url = new URL(urlString);
+            return [
+                url.origin,
+                url.pathname
+                    .split("/")
+                    .map(function (pathname) { return encodeURIComponent(pathname); })
+                    .join("/"),
+            ].join("");
+        });
+        HotUpdater.downloadFilesFromURLs(encodedURLs, prefix, function (success) {
             resolve(success);
         });
     });
 };
 export var init = function (_a) {
-    var metadata = _a.metadata;
+    var metadata = _a.metadata, onSuccess = _a.onSuccess, onFailure = _a.onFailure;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, files, id, _c, appVersionId;
+        var _b, files, id, _c, appVersionId, allDownloadFiles, e_1;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     if (!["ios", "android"].includes(Platform.OS)) {
-                        throw new Error("HotUpdater is only supported on iOS and Android");
+                        throw new HotUpdaterError("HotUpdater is only supported on iOS and Android");
                     }
-                    if (!(typeof metadata === "function")) return [3 /*break*/, 2];
-                    return [4 /*yield*/, metadata()];
+                    _d.label = 1;
                 case 1:
-                    _c = _d.sent();
-                    return [3 /*break*/, 3];
+                    _d.trys.push([1, 8, , 9]);
+                    if (!(typeof metadata === "function")) return [3 /*break*/, 3];
+                    return [4 /*yield*/, wrapNetworkError(metadata)];
                 case 2:
-                    _c = metadata;
-                    _d.label = 3;
+                    _c = _d.sent();
+                    return [3 /*break*/, 4];
                 case 3:
+                    _c = metadata;
+                    _d.label = 4;
+                case 4:
                     _b = _c, files = _b.files, id = _b.id;
                     return [4 /*yield*/, getAppVersionId()];
-                case 4:
+                case 5:
                     appVersionId = _d.sent();
-                    if (!(id !== appVersionId && id != null)) return [3 /*break*/, 6];
+                    if (!(id !== appVersionId)) return [3 /*break*/, 7];
                     return [4 /*yield*/, downloadFilesFromURLs(files, id)];
-                case 5:
-                    _d.sent();
-                    _d.label = 6;
-                case 6: return [2 /*return*/];
+                case 6:
+                    allDownloadFiles = _d.sent();
+                    if (allDownloadFiles) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess("INSTALLING_UPDATE");
+                    }
+                    else {
+                        throw new HotUpdaterError("HotUpdater failed to download");
+                    }
+                    return [2 /*return*/];
+                case 7:
+                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess("UP_TO_DATE");
+                    return [3 /*break*/, 9];
+                case 8:
+                    e_1 = _d.sent();
+                    if (onFailure) {
+                        onFailure(e_1);
+                        return [2 /*return*/];
+                    }
+                    throw e_1;
+                case 9: return [2 /*return*/];
             }
         });
     });

package/lib/wrapNetworkError.d.ts

@@ -0,0 +1,2 @@
+export declare function wrapNetworkError<T>(metadata: (() => Promise<T>) | (() => T)): Promise<T>;
+//# sourceMappingURL=wrapNetworkError.d.ts.map

package/lib/wrapNetworkError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapNetworkError.d.ts","sourceRoot":"","sources":["../src/wrapNetworkError.ts"],"names":[],"mappings":"AAEA,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,QAAQ,EAAE,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC,CAMZ"}

package/lib/wrapNetworkError.js

@@ -0,0 +1,54 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(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() { 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]); }; }
+    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 };
+    }
+};
+import { HotUpdaterError } from "./error";
+export function wrapNetworkError(metadata) {
+    return __awaiter(this, void 0, void 0, function () {
+        var error_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, metadata()];
+                case 1: return [2 /*return*/, _a.sent()];
+                case 2:
+                    error_1 = _a.sent();
+                    throw new HotUpdaterError("HotUpdater metadata is not defined");
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "React Native OTA solution for self-hosted",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -48,6 +48,9 @@
     "react": "^18.2.0",
     "react-native": "^0.72.6"
   },
+  "dependencies": {
+    "react-native-url-polyfill": "^2.0.0"
+  },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "typecheck": "tsc --noEmit",